reference_form commit
Merge branch 'master' of https://github.com/Manifold0/salkehatchieB

Conflicts:
	SalkehatchieB/config/routes.rb
Merge branch 'master' of https://github.com/Manifold0/salkehatchieB

Conflicts:
	SalkehatchieB/config/routes.rb