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