minor styling on landing page (br tag) and events)
fixed merge conflicts on landing page and events show
before pulling rupa's changes
fixed merge conflict in events show
Added facebook though with limited styling (to users#show)
finished tag feature. minor edits to event and user profile
Merge branch 'events_improvements' into develop
basic seeding...incomplete.
Merge branch 'develop' of https://github.com/yeaz/dancespace into develop
merge develop with db seed
Added facebook, twitter, yt, and ig to users#show and styled.
more db seeding
Merge branch 'develop' of http://github.com/yeaz/dancespace into develop

Conflicts:
	app/views/studios/show.html.erb
	app/views/users/show.html.erb
UI bug fixes
Merge branch 'develop' of http://github.com/yeaz/dancespace into develop
Merge branch 'sarah_finalsprint' into develop
removed mysql2
added mysql2
Merge branch 'develop' of https://github.com/yeaz/dancespace into develop
Added error checking for fb/twtr/ig/yt feed loading on users#show
and studios#show
Added test data for 8 users, their experiences,
experiencelinks, and 3 studios.
Still need to add: events, tags to everything