Initial commit
Merge branch 'master' of github.com:thinkfast2008/342A4