fixed css merge problem
organizing css
Merge branch 'master' into nat-add-homepage-stylin

Conflicts:
	app/assets/stylesheets/reservations/_show.css
cleaning things up
refining stylin
Merge branch 'master' into nat-add-homepage-stylin

Conflicts:
	app/assets/javascripts/reservation_index.js
	app/assets/stylesheets/guests/guests_index.css
reconciled merge problems
Merge branch 'master' into nat-add-homepage-stylin
tweaking, changed main font
no more update wait time method
ready for merge
Merge pull request #40 from gopher-snakes-2013/nat-add-homepage-stylin

whoo homepage lookin good