marshal/unmarshal crap
Merge branch 'master' of https://github.com/cbaconneumont/bacon_chris_csc360

Conflicts:
	ws_lunch/.idea/workspace.xml