css front page
Merge branch 'master' into jaz_from_home

Conflicts:
	Ruby/app/views/layout.erb
	Ruby/app/views/sign_in.erb
Merge pull request #11 from amelialaundy/jaz_from_home

great work team :)