stash in order to pull from github
Merge branch 'master' into add-header

Conflicts:
	app/views/main.scala.html
	public/stylesheets/main.css
complete adding content from Rails version to home page
merge from repo
Merge pull request #4 from robwblack/add-header

Complete home page content