merge conflicts
trimmed down amount of JS associated with tag form substantially. Moved it into proximity of notes area of discover page. Intial attempts to remove assoications to remote JS and CSS were not fruitful.
further refinement of tags. added explanation that a tag cannot contain a comma, since commas are used to separate tags. tags are not currently being saved anywhere; when you refresh the page, they go away.
populated a list of example tags
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.
fixed users controller merge problems
Merge pull request #40 from Noahhh/master

fixed users controller merge problems
Merge pull request #39 from dheckman/master

modified foursquare api data to pull tips and venue names
fixed issues with login/logout