Renaming files
Merge branch 'develop' of github.com:NigelCleland/lode into develop

Conflicts:
	lode/config.json
Renaming all of the files etc