created project and added user model
renaming 2 cols, adding gitgnore
Merge pull request #1 from amandamcwhorter/od/change_users_cols

renaming 2 cols, adding gitgnore
Added twitter-bootstrap-rails to app
Merge pull request #2 from amandamcwhorter/am/adding_bootstrap

 Added twitter-bootstrap-rails to app
added jquery ui to project
renaming 2 cols, adding gitgnore
renaming 2 cols, adding gitgnore
Merge pull request #4 from amandamcwhorter/od/user_table_change

renaming 2 cols, adding gitgnore
adding most tables
Merge pull request #5 from amandamcwhorter/od/db_schema

adding most tables
trying to fix the devise thing
trying to fix the devise thing
Merge pull request #6 from amandamcwhorter/od/implement_devise

Od/implement devise
removing all the extra rspec files
Merge pull request #7 from amandamcwhorter/od/implement_devise

removing all the extra rspec files
adding devise-generated files
Merge pull request #8 from amandamcwhorter/od/implement_devise

adding devise-generated files
added calendar controller and view
adding relationships and rest of tables