changed stuff
Merge branch 'master' of https://github.com/mamuso/thisisatest

Conflicts:
	README.md
Merge branch 'master' of https://github.com/mamuso/thisisatest