vital change
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/example/giambi/model/BankAccount.java
	src/com/example/giambi/model/LoginAccount.java
	src/com/example/giambi/model/Transaction.java