Added "NEW!" tag to food items
Resolved conflicts

Conflicts:
	menu.php
Merge branch 'master' of https://github.com/cep14-lsn/CEP-2014-Project

Conflicts:
	js/food_info.json
Merge branch 'master' of https://github.com/cep14-lsn/CEP-2014-Project

Conflicts:
	menu.php
Merge branch 'master' of https://github.com/cep14-lsn/CEP-2014-Project