Merge pull request #39 from WClement/master

money
fixed up gui for presentation