added gitignore /vendor
Merge remote-tracking branch 'upstream/master'

Conflicts:
	config/routes.rb
Added home controller
Merge pull request #2 from briardes/master

Added home controller