added project settings
Merge branch 'master' of https://github.com/huntdog1541/ProgProj2