Commit 12
Merge branch 'master' of https://github.com/TimMikeladze/css490-advanced-software-engineering-homework1

Conflicts:
	src/Main.java
	src/model/Account.java
	src/model/Card.java
	src/model/CheckingAccount.java
	src/model/CreditCard.java
	src/model/DebitCard.java
	src/model/SavingsAccount.java