updated memo. final commit
Final commit
adding type
Merge branch 'master' of git@github.com:eklu/com381
merging
unmerging
unmerging again
fixing unmerge issues