first commit
Merge remote-tracking branch 'GitHub/master'

Conflicts:
	.gitignore
gitignore updated