Refactor the way it should be (I need to use git mv)
Merge branch 'master' of https://github.com/DirkyJerky/OtherProgrammingClass