action bar menu navigation
basic layout for settings
Initial commit for training branch, create training UI and updated some intent creation
Removed hello world, testing
Created the final screen for training
settings and notification pages basic functionality. still need to tweak layout of settings page
fix connection to backend
Merge remote-tracking branch 'origin/training'
Merge remote-tracking branch 'origin/ui'

Conflicts:
	AndroidManifest.xml
	gen/com/example/knock_knock/R.java
	res/values/strings.xml
	src/com/example/knock_knock/TrainingMenu.java