A few fixes
Merge branch 'master' of github.com:xkizer/draxarts

Conflicts:
	css/mac.css