Updated style
Merge branch 'master' of https://github.com/LausDaeus/CodeForGood2014