Some Cleanup
Merge branch 'master' of github.com:mahsaa/Coopetition