Made some changes to some stuff
Merge branch 'master' of github.com:mj380/turnt-octo-archer