fixed files
Merge branch 'master' of https://github.com/Volvox/peace-opps