basic reservations skeleton
Reservations making skeleton
Merge remote-tracking branch 'origin/master'

Conflicts:
	server/config/routes.js
	server/controllers/index.js