Cleaning up merge clash
Merge branch 'master' of https://github.com/conz/lmars

Conflicts:
	src/.settings
Checking that all is OK with git