3rd attempt
3rd attempt
3rd attempt
Merge branch 'newnfr'
Fixed map crash
Merge branch 'master' of https://github.com/decker325/BudgetCat

Conflicts:
	app/src/main/java/com/managment/data/Account.java
	app/src/main/java/com/managment/dataFile/XMLDataInjection.java