Merge branch 'master' of https://github.com/loganallenc/RunningDJ

Conflicts:
	mobile/src/main/java/htn/logan/runningdj/MainActivity.java
	mobile/src/main/res/layout/fragment_main.xml