reformatting
Merge branch 'master' of https://github.com/bevins2016/DCCApp

Conflicts:
	src/com/example/dcc/EDailyActivityFrag.java
	src/com/example/dcc/EasterEggs.java