Kris 05-04-2013 v1.2
Kris 05-04-2013 v1.2
Kris 05-04-2013 v1.2
Merge branch 'master' of https://github.com/OnlineMagic/HallebaekProject.git