- Remove messy stuff
- create conflict
Merge branch 'messy'

Conflicts:
	README.txt