Edit trainer, contact form
Merge branch 'master' of https://github.com/hkraji/fitness-tutorial

Conflicts:
	config/routes.rb