Initial commit
Merge branch 'master' of https://github.com/MrLogic85/Pixelate

Conflicts:
	.project
	AndroidManifest.xml
	project.properties
	res/drawable-hdpi/ic_launcher.png
	res/drawable-mdpi/ic_launcher.png
	res/drawable-xhdpi/ic_launcher.png
	res/layout/activity_colour_palettes.xml
	res/layout/activity_menu.xml
	res/values-v11/styles.xml
	res/values-v14/styles.xml
	res/values/dimens.xml
	res/values/strings.xml
	res/values/styles.xml