Merge conflict resolved
Merge branch 'master' of github.com:nkabrown/japan-spa
CSS styles for contact.erb