Committing for reference. Going to start again.
Merge branch 'develop' of github.com:atomicules/HaskerDeux into develop

Conflicts:
	haskerdeux-api.hs

Don't really care though as starting anew.
Cleaning up to start again