autogen push...

class files and whatnot
R push..

push of R
APK

APK
Merge branch 'In-Line' of https://github.com/supercclank/CS2340 into In-Line

Conflicts:
	FinancialPlanner/bin/FinancialPlanner.apk
	FinancialPlanner/bin/classes.dex

FinancialPlanner/bin/classes/com/example/financialplanner/LoginActivity.
class
	FinancialPlanner/bin/classes/com/example/financialplanner/R$id.class

FinancialPlanner/bin/classes/com/example/financialplanner/RegistryActivi
ty.class
	FinancialPlanner/bin/resources.ap_
	FinancialPlanner/gen/com/example/financialplanner/R.java