WIP
Merge branch 'master' into contact-us
Merge branch 'master' into contact-us

Conflicts:
	config/routes.rb
Add pry-rails
Add contact form
Make contact form more mobile friendly
Merge pull request #14 from uxsg/contact-us

Add contact form