changes
Merge branch 'master' of https://github.com/traveltrousers/test

Conflicts:
	README.md
Merge branch 'master' of https://github.com/traveltrousers/test