Added stuff I already had
Merge branch 'master' of https://github.com/frostblooded/SchoolHomework