reverting to pre-haml and adding ability to add new restaurants
fixing bug where restaurant#show fails if there is no category
password field should be a password field! was displaying text in browser
minimal version of creating a reservation. also removing ui bits that refer to features that don't exist yet
adding datetimes to reservations. sorta necessary. also autosetting the end time to two hours after the start time
replacing choosing arbitrary times for reservations with half hour interval times within the next few days
adding number of people attribute to reservations and using it
disallowing reservations when the restaurant is full; adding additional validations; moving form errors to partial; moving attributes/methods that belong in restaurant model to there from reservation model; adding default restaurant capacity
Merge branch 'fall_2013'

Conflicts:
	app/views/home/home.html.haml
	app/views/layouts/application.html.erb
	app/views/restaurants/index.html.erb
	app/views/restaurants/show.html.erb
	app/views/sessions/new.html.erb
adding rspec, creating first unit test file. also removing some test::unit files with no actual tests in them
minor refactoring of model; reordering lines
commenting out an assocation until it is actually being used
replacing test:unit unit test for users with rspec unit test
better name for a test method
adding note about something that needs to be fixed
slightly better factory for category
slightly improved factory for reservation
replacing test::unit test for reservation model with rspec one
drastically simplifying reservations. now you can book at hour intervals and only stay for an hour
removing empty helpers for unit:test tests which were deleted earlier