stuff
Merge branch 'master' of https://github.com/mrowland7/Project-Planet
fixed osme bugs