mediaqueries.css 320px v0.1
Merge branch 'master' of https://github.com/edwardsamuel/IF3038-2013

Conflicts:
	src/index.css
	src/index.html
Merge branch 'master' of https://github.com/edwardsamuel/IF3038-2013