Initial Commit
Merge remote-tracking branch 'origin/master'
Fixing the initial commit
Conflicts:
	.gitignore
	README.md