Did some changes and stuff
Merge branch 'makechanges'

Conflicts:
	README.md