Added .gitignore file
cleanup ignore things
Merge branch 'master' into Bioharness

Conflicts:
	bin/AndroidManifest.xml
	bin/classes.dex
	bin/classes/com/william/r_tug/MainActivity.class
	bin/classes/com/william/r_tug/R$id.class
	bin/classes/com/william/r_tug/R$layout.class
	bin/classes/com/william/r_tug/R$menu.class
	bin/classes/com/william/r_tug/R$string.class
	bin/classes/com/william/r_tug/R$style.class
	bin/dexedLibs/android-support-v4-bb021f0765299cac9f97155df13aa913.jar
	bin/resources.ap_
	gen/com/william/r_tug/R.java