Making changes.
Merge branch 'conflict-on-merge'

Conflicts:
	README.md
    Fixed all the problems