The changes I had to make to get this development environment to work
Added javascript animated navbar, new banner (banner is temporary, needs to be refined or redesigned, but better than previous one), navbar still buggy
commented out some jquery from myjquery.js, still need to delete some unnecessary code
Merge branch 'redesign-nav' of https://github.com/colin92/www into redesign

Conflicts:
	db/schema.rb
	db/seeds.rb
Removed scratch files
cleaned up myjquery.js code and application.css.scss code
Changed upsidedown footer border-top
Spritzed up flashes
Changed open room status background color
Merge branch 'redesign'