idk
Merge branch 'master' of github.com:chrissprague/D2B-Android

Conflicts:
	res/layout/activity_main.xml