Merged changes
Merge branch 'master' of https://github.com/jmoral4/scoutabout
Merge branch 'master' of https://github.com/jmoral4/scoutabout