Merge branch 'dev' of https://github.com/spinnytea/chasingshadows into dev-2
Merge branch 'dev' of https://github.com/davism4/chasingshadows into dev-2