Change from desktop to demonstrate conflict resolution.
Try to make a conflict
Merge branch 'master' of git://github.com/mgainer/robotwar

Conflicts:
	README.md