Here is the baseline

Currently bugged: NULL Pointer exception. Planning to check manifest
Test sync
Merge branch 'master' of https://github.com/zaclolz/T4

Conflicts:
	TapTwistTunes/bin/classes/android/support/v7/appcompat/R$layout.class
	TapTwistTunes/bin/classes/com/example/taptwisttunes/MainActivity.class
	TapTwistTunes/bin/classes/com/example/taptwisttunes/R$drawable.class
	TapTwistTunes/bin/classes/com/example/taptwisttunes/R$id.class
	TapTwistTunes/bin/classes/com/example/taptwisttunes/R$integer.class
	TapTwistTunes/bin/classes/com/example/taptwisttunes/R$layout.class
	TapTwistTunes/bin/classes/com/example/taptwisttunes/R$menu.class
	TapTwistTunes/bin/classes/com/example/taptwisttunes/R$string.class
	TapTwistTunes/bin/classes/com/example/taptwisttunes/R$style.class
	TapTwistTunes/bin/classes/com/example/taptwisttunes/R$styleable.class