Initial commit
Improve the README
Merge https://github.com/themcstaplez/proj1

Conflicts:
	README.md