app outline
Merge https://github.com/makinj/ohmg

Merging should allow me to commit what I have locally to git.
trying to commit before pull
Merge branch 'master' of https://github.com/steveh152/ohmg

Conflicts:
	AndroidManifest.xml
	bin/classes/com/RCOS/ohmmygosh/BuildConfig.class
	bin/classes/com/RCOS/ohmmygosh/MainActivity.class
	bin/classes/com/RCOS/ohmmygosh/R.class
	out/production/OhmMyGosh/OhmMyGosh.apk
	out/production/OhmMyGosh/OhmMyGosh.unaligned.apk
	out/production/OhmMyGosh/com/RCOS/ohmmygosh/MainActivity.class
	out/production/OhmMyGosh/com/RCOS/ohmmygosh/R$drawable.class
	out/production/OhmMyGosh/com/RCOS/ohmmygosh/R$id.class
	out/production/OhmMyGosh/com/RCOS/ohmmygosh/R$layout.class
	out/production/OhmMyGosh/com/RCOS/ohmmygosh/R$menu.class
	out/production/OhmMyGosh/com/RCOS/ohmmygosh/R$string.class
	out/production/OhmMyGosh/com/RCOS/ohmmygosh/R$style.class
	out/production/OhmMyGosh/com/RCOS/ohmmygosh/R.class
	out/production/OhmMyGosh/com/RCOS/ohmmygosh/Resistance.class
	res/layout/activity_bands.xml
	res/layout/activity_main.xml
	res/values/strings.xml
	src/com/RCOS/ohmmygosh/MainActivity.java
	src/com/RCOS/ohmmygosh/Resistance.java
shell of app nearly complete