...
Merge branch 'master' of https://github.com/MadisKarli/TeamEdward
2.4 halfway done.