[MERGE]
Merge branch 'master' of github.com:ShinobiDevs/bascout
Merge branch 'master' of heroku.com:intense-hollows-3430