Initial commit

Conflicts:
	README.md
Initial commit

Conflicts:
	README.md
haha