first commit
Merge https://github.com/bagland/cs247-project1