Justin's fix for bug #30, github isn't working for him. Note this commit should be counted as his
Merge branch 'master' of github.com:wspurgin/NightKnights
automerge