Premier commit
Merge branch 'master' of github.com:samygTheodo/test-theodo

Conflicts:
	.gitignore
	README.md