small bugs
Adding a couple more files to try to merge master in
Merge branch 'master' of github.com:stream9/proi into dev
trying to merge
trying to merge