final fix for gitignore and added mercenary class