-
Merge branch 'master' of https://github.com/sanderbongers/prototype

Conflicts:
	app/views/static_pages/home.html.erb