Finished Q1 of A1.
Merge branch 'master' of https://github.com/cmtm/ECSE-549