latest code
add crab to market
controller
final updates
Merge branch 'master' of https://github.com/huaraco/foodie

Conflicts:
	img/Thumbs.db