First commit
Merge branch 'master' of https://github.com/tpfaff/CS497A1