first upload
modifications
Merge branch 'master' of https://github.com/linux1man/1stproj