Initial commit of project1
Merge branch 'master' of https://github.com/shadowym/project1