Added cabal files
Commented out unnecessary concept-testing stuff
Merge branch 'master' of github.com:esmolanka/hamr