ugh
haahMerge branch 'master' of https://github.com/mrjazzysays/CatNap into production

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/CatNap.apk
	bin/R.txt
	bin/classes.dex
	bin/classes/com/cedideas/catnap/AlarmDialog$2.class
	bin/classes/com/cedideas/catnap/AlarmDialog.class
	bin/classes/com/cedideas/catnap/NapActivity$2$1.class
	bin/classes/com/cedideas/catnap/NapActivity$2.class
	bin/classes/com/cedideas/catnap/NapActivity$3.class
	bin/classes/com/cedideas/catnap/NapActivity$4$1.class
	bin/classes/com/cedideas/catnap/NapActivity$4.class
	bin/classes/com/cedideas/catnap/NapActivity$5$1.class
	bin/classes/com/cedideas/catnap/NapActivity$5.class
	bin/classes/com/cedideas/catnap/NapActivity$6.class
	bin/classes/com/cedideas/catnap/NapActivity.class
	bin/classes/com/cedideas/catnap/Options.class
	bin/classes/com/cedideas/catnap/R$attr.class
	bin/classes/com/cedideas/catnap/R$color.class
	bin/classes/com/cedideas/catnap/R$drawable.class
	bin/classes/com/example/catnap/MainActivity.class
	bin/dexedLibs/android-support-v4-2cafec73e8eb80bb66e84be9af898c4d.jar
	bin/dexedLibs/google-play-services-73eb371953b1c1637cebb061ccc631ba.jar
	bin/dexedLibs/google-play-services_lib-bad9b1095aa969f8269fe64556875b84.jar
	bin/res/crunch/drawable-hdpi/hdpi_cat.png
	bin/resources.ap_
	gen/com/cedideas/catnap/R.java
	res/drawable-hdpi/hdpi_cat.png
	src/com/cedideas/catnap/MainActivity.java