Remove the "end" bit when unmarshalling
Added comments
Merge branch 'master' of https://github.com/dWarf-In-thE-FlaSk/CSC411.git