Old stuff from room.
Merge branch 'master' of https://github.com/murukeshm/scratchpad

Conflicts:
	haskell/parser.hs