merging
merged
clean up
added fighter and shopping list to work