created framework from old repo.  will do authentication
authentication
did some auth stuff but db uncooperative
deleted other tables so I wont conflict with Chris.  added bootstrap files and testing authentication.  Seems to work
last commit before leaving class, everything looks good so far.  tightening up everything before the merge tomorrow
auth and sessions seem  solid and can tweak when we merge.Twitter bootstrap is in. controllers should have html/json respond to laid out
last commit before bundling rpec testing suite.
testing suite is set up in Spec folder and I have a good grasp of how and what to test.  This folder should fill up quickly in the next two days
final commit before merge
Merge branch 'authentication' into develop
Merge branch 'develop' of github.com:cmwright33/the_perfect_pint into develop

Conflicts:
	Gemfile
	Gemfile.lock
	app/models/beer.rb
	app/models/flavor.rb
	db/schema.rb
fixed merging ref errors
fixed conflicts