sdfs
Merge branch 'master' of https://github.com/amunra81/projects

Conflicts:
	haskell/typeFamilies.hs