Resolved some merge conflicts and such
Added stuff I forgot aobut
Resolved some conflicts, playing around with layout
Merge branch 'master' of github.com:USGS-CIDA/CIDA-Viz
Merge branch 'master' of github.com:USGS-CIDA/CIDA-Viz

Conflicts:
	Vizzies/public_html/index.html
	Vizzies/public_html/js/main.js
Merge pull request #151 from jiwalker-usgs/master

Random changes