Merge pull request #1 from MiamiOH-CSE274/proctopj

Proctopj
Implemented all of Brinkman's //TODO memos
Merge pull request #22 from proctopj/proctopj

Proctopj