Something
Merge branch 'Josh' of https://github.com/joshmeek/DaemonDash into Josh

Conflicts:
	sustainabilityWebsite/app/views/layouts/application.html.erb