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

Conflicts:
	app/assets/images/Color Picker/tutorial_picker1.jpg
	app/assets/images/Color Picker/tutorial_picker2.jpg
	app/assets/images/Color Picker/tutorial_picker3.jpg
	app/assets/images/Color Swatches/tutorial1.jpg
	app/assets/images/Color Swatches/tutorial2.jpg
	app/assets/images/Color Swatches/tutorial3.jpg
	app/assets/images/Color Swatches/tutorial4.jpg
	app/assets/images/PaintDIY/tutorial_paintDIY1.jpg
	app/assets/images/PaintDIY/tutorial_paintDIY2.jpg
	app/assets/images/PaintDIY/tutorial_paintDIY3.jpg
	app/assets/images/banner_contact_us.jpg