fixing merger
Merge branch 'master' of github.com:kil432/Farmar-Rails

Conflicts:
	config/routes.rb