First Commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md

	new file:   .gitignore
	modified:   README.md
	modified:   README.md