Committing to the repository
Fixing Merge Problem
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md