Multiple definitions.  Need to make a header file.
Pushed progress from last meeting
Progress from last meeting
Fixed merge conflicts from test commit.