Merge pull request #27 from MooreJesseB/master

Add full non-authorized user access.
Working on connecting gon
Merge branch 'master' of git://github.com/TeamGlorious/explorify
Merging Jesse
Conflicts:
	app/views/shared/_center_col_header.html.erb
Still working on dom
Merge pull request #28 from SalamanderMike/master

End of evening commit
Add production gem
Merge pull request #29 from SalamanderMike/master

Add production gem for Heroku deployment
morning governa
merge solved trips data
porting Instagram data to maps
Merge pull request #30 from sbokaie/master

ENV var setup + minor styling
Merge branch 'master' of git://github.com/TeamGlorious/explorify

Conflicts:
	.gitignore
	app/views/trips/show.html.erb
Merge from Shawn
Merge pull request #31 from SalamanderMike/master

Ported trip data into maps
Validations and flash messages
Merge conflict resolved
Fix merge conflicts.  Add validations to trip creation