Initial commit project setup
Merge mamoth

Conflicts:
	README.md