refactor main a bit more
Merge branch 'master' of github.com:jweissman/haskell
add more adjs and nouns