re-map

re-map
Merge branch 'master' of https://github.com/nymphaeum/lorkas

Conflicts:
	AMES_patches/.DS_Store
	AMES_patches/MadMapper/.DS_Store