Initial commit
Merge branch 'master' of github.com:stianvhagen/mercury

Conflicts:
	README.md