column interaction
gitignore adjustments
Merge branch 'pix-app' into develop

Conflicts:
	.gitignore
	build/fonts/Pix-ae653cea290ff6ab86c68c76b7acc221.eot
	build/fonts/Pix-ae653cea290ff6ab86c68c76b7acc221.svg
	build/fonts/Pix-ae653cea290ff6ab86c68c76b7acc221.ttf
	build/fonts/Pix-ae653cea290ff6ab86c68c76b7acc221.woff
	build/fonts/Pix.css
	build/fonts/Pix.html
	pix.sublime-workspace