Attempting to fix repo sync conflicts
Merge branch 'master' of https://github.com/hackersob226/AndroidProject

Conflicts:
	JUnitTests/src/SingletonTest.java
	MoneyCruncher/src/com/example/memory/CashFlowReport.java
	MoneyCruncher/src/com/example/memory/Report.java
	MoneyCruncher/src/com/example/memory/SpendingCategoryReport.java
	MoneyCruncher/src/com/example/moneycruncher/AccountActivity.java
	MoneyCruncher/src/com/example/moneycruncher/CashFlowReportActivity.java
	MoneyCruncher/src/com/example/moneycruncher/CreateAccountActivity.java
	MoneyCruncher/src/com/example/moneycruncher/DepositActivity.java
	MoneyCruncher/src/com/example/moneycruncher/DisplayAccountActivity.java
	MoneyCruncher/src/com/example/moneycruncher/LoginActivity.java
	MoneyCruncher/src/com/example/moneycruncher/MainActivity.java
	MoneyCruncher/src/com/example/moneycruncher/RegisterActivity.java

	MoneyCruncher/src/com/example/moneycruncher/SpendingCategoryReportActivity.java
	MoneyCruncher/src/com/example/moneycruncher/WithdrawActivity.java
	MoneyCruncher/src/com/example/presenter/Presenter.java
	MoneyCruncher/src/com/example/presenter/SpendingCategoryPresenter.java
	MoneyCruncher/src/com/example/presenter/WithdrawPresenter.java