Final commit for the night
Merge pull request #42 from MagiciansArtificeTeam/dev

Final commit for the night and new build