Project 2b in CS 537. Will try to stick to this model (http://nvie.com/posts/a-successful-git-branching-model/)