Scout Report on navbar
Shifted nav buttons to right, hid Scout Report button
Merge conflict cleanup
Merge pull request #13 from mclyde/mattlocal3

Shift nav bar buttons right