Initial commit
Merge https://github.com/bennetthansen/CS188-Project2