upload related files
Merge branch 'master' of https://github.com/huaraco/foodie

Conflicts:
	views/promotionList.html