clean up sources
Merge branch 'master' of https://github.com/johnnyyan/515project