Initial commit
first commit
now merged
THURSDAY
Merge https://github.com/tdicken73/barFinal

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/classes.dex
	bin/resources.ap_
	ic_launcher-web.png
	res/drawable-hdpi/ic_launcher.png
	res/drawable-ldpi/ic_launcher.png
	res/drawable-mdpi/ic_launcher.png
	res/drawable-xhdpi/ic_launcher.png
	res/drawable-xxhdpi/ic_launcher.png
	res/layout-land/fragment_menu.xml
	res/layout/fragment_menu.xml
	res/layout/settings.xml
	res/values/strings.xml
THURSDAY