media queries added
Merge branch 'master' of https://github.com/TimoOenjoe/IF3038-2013