Merge branch 'master' of https://github.com/swillard13/sc-assassins

Conflicts: