Initial import
Update .gitignore for Github haskell
Merge conflict