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

Conflicts:
	src/com/example/dcc/MainActivity.java