changed the skeleton in decoder a bit, started working on the collapse function
Merge remote-tracking branch 'origin/ALTOneBranch' into
AssignmentTwoHubert

Conflicts:
	ALTOne/decoder.py