init
update gitignore
Merge remote-tracking branch 'shared/master'

Conflicts:
	.gitignore
	README.md