commiting bin files
merge
merge
Merge branch 'master' of https://github.com/ecahill/CS2340

Conflicts:
	bin/CS2340.apk
	bin/classes.dex
Merge branch 'master' of https://github.com/ecahill/CS2340

Conflicts:
	bin/CS2340.apk
	bin/classes.dex
	bin/classes/com/example/activities/AccountCreationActivity$1.class
	bin/classes/com/example/activities/AccountCreationActivity.class
	bin/classes/com/example/activities/AccountMain$1.class
	bin/classes/com/example/activities/AccountMain$2.class
	bin/classes/com/example/activities/AccountMain$3.class
	bin/classes/com/example/activities/AccountMain.class
	bin/classes/com/example/activities/AccountViewActivity$1.class
	bin/classes/com/example/activities/AccountViewActivity.class
	bin/classes/com/example/activities/LoginActivity$1.class
	bin/classes/com/example/activities/LoginActivity.class
	bin/classes/com/example/activities/MainActivity.class
	bin/classes/com/example/activities/MakeTransactionActivity$1.class
	bin/classes/com/example/activities/MakeTransactionActivity.class
	bin/classes/com/example/activities/RegisterActivity.class
	bin/classes/com/example/activities/SpendCatReportActivity.class
	bin/classes/com/example/activities/ViewAccountsActivity.class
	bin/classes/com/example/cs2340/R$id.class
	bin/classes/com/example/cs2340/R$layout.class
	bin/classes/com/example/cs2340/R$menu.class
	bin/classes/com/example/cs2340/R$string.class
	bin/classes/com/example/cs2340/R$style.class
	bin/classes/com/example/model/DatabaseHandler.class
	bin/classes/com/example/model/SessionManager.class
	bin/classes/com/example/model/Transaction.class
resolved merge conflicts
added javadocs to model package