Merge branch 'master' into Brandon

Conflicts:
	app/src/main/java/com/example/john/debtmania/Main.java
	app/src/main/res/layout/activity_main.xml
	app/src/main/res/values/strings.xml