updated styles
Merge branch 'master' of https://github.com/Makae/ch.bfh.bti7054.w2014.q.groot