just to be sure.
Merge branch 'AssignmentTwoHubert' into ALTOneBranch

Conflicts:
	ALTOne/decoder.py
added stacks and a few other things
Merge remote-tracking branch 'origin/ALTOneBranch' into
AssignmentTwoHubert

Conflicts:
	ALTOne/decoder.py