Chore history ordered from last to first, Chore marketplace ordered by max points to least, Added Mark completed link to current chores in user show page
fixed merge conflict