Changed contact info
Merge branch 'master' of https://github.com/MarkusAlexander/Projektarbete-2014.git