before I mess up the CSS & HTML with styling
new stuff
Merge remote-tracking branch 'origin/patsy' into patsy

Conflicts:
	app/assets/images/matrix.png
	app/assets/javascripts/static_pages.js.erb
	app/views/static_pages/index.html.erb