fix time
Merge branch 'master' of https://github.com/anchor/marquise into fix-time

Conflicts:
	src/DataProgram.hs
missed a change because emacs crashed again WTF
Merge pull request #17 from anchor/fix-time

Looks good