Adding screen
Merge branch 'master' of https://github.com/BBensch/Flak-Cannon

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/res/values/strings.xml

Added a basic list view and hooked up the screens correctly