merge and resolve conflicts

ruby-scripts/bank.rb

@@ -1,9 +1,13 @@
+
+require 'date'
+
 class BankAccount
 
 	def initialize(first_name, last_name)
 
-		# make a object (in ruby it's called a Hash) of all of the info we need,
+		# make a object of all of the info we need,
 		# this way it's all in a nice group instead of tons of individual variables
+
 		@attr = Hash.new()
 
 		@attr["first_name"] = first_name
@@ -16,34 +20,56 @@ def initialize(first_name, last_name)
 
 	end
 
-	def deposit(amount)
+	def deposit
 
 		puts "How much would you like to deposit?"
 
 		amount = gets.chomp
+
 		# this is a test push to see if i am 'gitting' this software correctly no changes have been made other then this comment
-		# access attribures as an object
-		# i think you can also do @attr.balance
 		@attr["balance"] += amount.to_f
 
-		message = "$#{amount} has been deposited."
+		@attr["transactions"] << track("withdrawl")
+
+	end
+
+	def withdraw
+
+		puts "How much would you like to withdraw?"
+
+		amount = gets.chomp
+
+		@attr["balance"]-= amount.to_f
 
-		# push this transaction to the end of the transactions array
-		@attr["transactions"] << message
+		@attr["transactions"] << track("withdrawl")
 
-		puts message
+	end
+
+	def track(type)
+
+		return  {
+
+			"type" => type,
+
+			"time" => DateTime.now(),
+
+			"result" => balance()
+		}
 
 	end
 
-	def show_balance
+	def balance
 
-		puts "Your current balance is $#{@attr["balance"]}"
+		puts "Your current balance is $#{@attr['balance']}"
+
+		return @attr["balance"]
 
 	end
 
-end
+	def report
 
-bank_account = BankAccount.new("Chocolate", "Tomato")
+		puts@attr
 
-bank_account.deposit(200)
-bank_account.show_balance
+	end
+
+end