Updated CSS

Added color and box-sizing
Merge branch 'dev' into dbarth

Conflicts:
	css/main.css

Fixed merge conflict

Style was removed: Added back in with changes
Merge branch 'dbarth' into dev