trying to merge
added scout.cs
Merge branch 'rockwotj'
Fixing conflicts