.settings file changed after the last push because I closed IDE down
Merge branch 'master' of https://github.com/conz/lmars

Conflicts:
	src/.settings