addWish gives an "id" to the wishes
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	routes/index.js