fixes
Merge branch 'master' of https://github.com/kennethnorman/TheAirwaves

Conflicts:
	index.css