ignore
Merge branch 'master' of https://github.com/geoonn/SissonsPaint

Conflicts:
	Resources/android/alloy/controllers/colourSwatches.js
	Resources/android/alloy/controllers/diyPaint.js
	Resources/android/alloy/controllers/home.js
	Resources/android/alloy/controllers/index.js
	Resources/android/alloy/controllers/main.js
	Resources/android/alloy/controllers/menu.js
	Resources/android/alloy/controllers/storeLocator.js
	Resources/android/alloy/controllers/storeLocatorByState.js
	Resources/android/alloy/styles/index.js
	Resources/android/alloy/styles/main.js
	Resources/android/alloy/styles/menu.js
	Resources/android/alloy/styles/storeLocator.js
	Resources/android/alloy/styles/storeLocatorByState.js
	app/controllers/colourSwatches.js
	build/alloy/build.json
	build/android/assets/alloy/controllers/aboutUs.js
	build/android/assets/alloy/controllers/colourSwatches.js
	build/android/assets/alloy/controllers/storeLocator.js
	build/android/assets/alloy/models/Category.js
	build/android/assets/alloy/styles/aboutUs.js
	build/android/assets/alloy/styles/colourPicker.js
	build/android/assets/alloy/styles/colourSwatches.js
	build/android/assets/alloy/styles/diyPaint.js
	build/android/assets/alloy/styles/home.js
	build/android/assets/alloy/styles/index.js
	build/android/assets/alloy/styles/main.js
	build/android/assets/alloy/styles/menu.js
	build/android/assets/alloy/styles/storeLocator.js
	build/android/assets/alloy/styles/storeLocatorByState.js
	build/android/assets/alloy/underscore.js