First commit of Project 2

Apparently I messed up last time I did this.