Merge branch 'Board_Page'

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
	README
	app/assets/stylesheets/bootstrap-responsive.min.css
	app/assets/stylesheets/bootstrap.min.css
	app/assets/stylesheets/main.css
	app/views/layouts/application.html.haml
	config/routes.rb
Merge branch 'user_login'

Conflicts:
	Gemfile.lock
	app/models/user.rb
	config/routes.rb
Merge branch 'master' of https://github.com/aaronjosephs/BTV_project
Working on hamburger button.
Merge remote-tracking branch 'origin/master'

Conflicts:
	config/routes.rb
I need to remember to push my commits...
try to make ham button work