new style sheets
Merge branch 'master' of github.com:dbltnk/ggj14

Conflicts:
	app/views/static_pages/intro2.html.erb
	app/views/static_pages/intro3.html.erb
	app/views/static_pages/intro4.html.erb
	app/views/static_pages/intro5.html.erb
image fixes