config routes
Merge branch 'master' of git@github.com:robintran/ownproject.git

Conflicts:
	config/routes.rb
change gem and config