Style fixes.
Merge branch 'demo/master' of https://github.com/nskinkel/309Project into demo/master
Added test main to manager.