Cleaned And Fixed
added some stuff too
Merge branch 'master' of https://github.com/mmpetrillose/Ctrl-PProject