at media for larger screens
Merge branch 'master' of https://github.com/Dacode45/wuhack2014

Conflicts:
	css/style.css