changes
Merge branch 'master' of https://github.com/evanfriday/EECE411
Merge branch 'master' of https://github.com/evanfriday/EECE411
edits, mainly restructuring, removing static on KeyValuePair class