finalized stuff
Merge branch 'master' of github.com:shaunoconnell/scala-tools