Gemfile updated with my typical testing and debugging gems. User model generated with basic association (commented out until other models exist) and validation tests
created session controller
added more specificity to email validation
license removed for now while best license is researched
generated OffDay and School models. Started writing school model tests. Committing before pulling down upstream
merged conflicts
Removed Sessions controller
built basic tests for off_day model, added reference migrations to get associations to pass
removed User model to make way for Devise
commented bcrypt out of gemfile
merge conflicts
Merge pull request #8 from nickpassarella/master

Added basic school and off_days models with basic association and validation tests. Added reference columns where needed.
merged conflicts
t push origin masterMerge branch 'deedeelavinder-master'
merging conflicts
Merge pull request #9 from nickpassarella/master

DeeDee's pull request with conflicts merged
updated fixtures for Devise user model
Merge pull request #10 from nickpassarella/master

updated fixtures for Devise user model
Merge branch 'master' of https://github.com/lunchpad/lunchpad.us into upstream_merge
merge with master