Add new options to sell-on-ebay
Add candy courier page
Add text to gnome-population option
Reformat line to merge conflict for auto-merge
Shorten lines for auto-merge
Shorten lines for auto-merge
Change whitespace at end of first line to match original
Merge branch 'master' into my_changes

Conflicts:
	english/count-the-marshmellows/sell-on-ebay/sell-on-ebay.md
Reformat to please my auto-merge master Casey-collab
Merge pull request #179 from rfinnigan/my_changes

Rfinnigan changes