members task
Merge branch 'master' of https://github.com/engelgabriel/famtask

Conflicts:
	client/rewards.html