feature 11,16
test commit, increase vibration duration
Merge branch 'master' of https://github.com/HolyJecht/ShakeItOut.git

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/ShakeItOut.apk
	bin/classes.dex
	bin/classes/com/example/shakeitout/MainActivity$1.class
	bin/classes/com/example/shakeitout/MainActivity$2.class
	bin/classes/com/example/shakeitout/MainActivity.class
	bin/resources.ap_
	src/com/example/shakeitout/MainActivity.java