add contact and use guard instead of rspec directly
application layout
Merge branch 'master' into filling-in-layout
Finish layout and routes