merge conflicts
Merge pull request #34 from gregburton/master

tags working (but need work)
modified Foursquare API call to retrieve tip, venue name and url
Merge pull request #36 from dheckman/master

modified Foursquare API call to retrieve tip, venue name and url
Merge branch 'master' of https://github.com/gregburton/Ramblethru into gregburton-master

Conflicts:
	Gemfile
	app/controllers/users_controller.rb
	app/models/user.rb
	app/views/home/index.html.erb
	app/views/layouts/application.html.erb
	config/routes.rb
	db/schema.rb
Merge branch 'gregburton-master'
merging
merge
Merge pull request #38 from Noahhh/master

Merged greg's trimming of JS tag file/population of tags with me and pushing it up.