update routes
update routes
Merge remote-tracking branch 'upstream/master'
add contact form
Merge branch 'master' of github.com:JurgensSmit/codetry into JurgensSmit-master

Conflicts:
	config/routes.rb
	db/schema.rb