Shake It Baby
Merge remote-tracking branch 'origin/master'

Conflicts:
	App/ShakeItUp/bin/classes/com/example/shakeitapp/MainActivity.class
	App/ShakeItUp/src/com/example/shakeitapp/MainActivity.java