Update for latest heist
Merge branch 'master' of github.com:Soostone/charade

Conflicts:
	src/Charade.hs