changed route and controllers
added gem to gemfile
added gitignore /vendor
Merge remote-tracking branch 'upstream/master'

Conflicts:
	config/routes.rb