4:000PM Commit (Day 2)

Back from unexpected break.
Merge branch 'master' of https://github.com/DCatcherMc/ModJam