test coreccted
nail bug corrected
Merge branch 'master' of https://github.com/2easy/nailmaker

Conflicts:
	config/routes.rb