Merge branch 'dbarth' into dev
Revert "Removed content"

This reverts commit 443b842e41d60a94874d25fbe6d780066a441ae5.
We don't need this anymore
Merge branch 'dev' into dustin
Merge branch 'dustin' into dev
Merge branch 'dev' into dbarth

Conflicts:
	css/main.css

Fixed merge conflict

Style was removed: Added back in with changes