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

Conflicts:
	README.md
Version 1.0
Version 1.0 Just a change