commited to github
Merge remote-tracking branch 'upstream/master'
code done, beginning unit testing
pc5 added
compiled successfully, working unit tests
unit tests passed
Merge from master
pc5 graded 2014.02.10