committing so i can pull
Merge branch 'master' of https://github.com/tcase360/restaurant2

Conflicts:
	public/js/config.js

merged with jose's files
Merge branch 'master' of https://github.com/tcase360/restaurant2

pulling database info
CRUD_CREATE