Merge branch 'master' of https://github.com/OnlineMagic/HallebaekProject.git