Project One Beta Version.
Merge branch 'master' of github.com:ymzong/dsf14
Modify .gitignore