Initial commit
Initial commit
Merge remote-tracking branch 'Github/master'

Conflicts:
	.gitignore
	README.md