Revert ""

This reverts commit 43ee0140aaa28ec3493e7ae70d5c7619e16b8d14.
Merge branch 'master' of https://github.com/OnlineMagic/HallebaekProject.git