Sqaures
Merge branch 'master' of https://github.com/captDaylight/champagne-rocks

Conflicts:
	app/img/nx.jpg
	app/img/ny.jpg
	app/img/nz.jpg
	app/img/px.jpg
	app/img/py.jpg
	app/img/pz.jpg