for pull
for pull
Merge http://github.com/MattHamada/PantryChef

Conflicts:
	.idea/dataSources.xml
setting up index page