Wrap up work
Merge branch 'master' of github.com:MakotoTheKnight/Project-Archon
Progress (before presentation)