- added some models and created a dives view
Created a very basic dives view. I haven't been able to test that it
actually works yet though because I haven't figured out a good DBMS for
Sqlite3 to use and haven't added any data to the database. Currently the
root page is mocking the session[:userId] varible to just be 1 since we
don't have any authentication set up.
-fixed a hastely made prototype table
db schema update?
Merge branch 'ActiveRecord'

Conflicts:
	divelog/Gemfile.lock
	divelog/app/models/user.rb
	divelog/db/schema.rb
Merge branch 'master' of https://github.com/erahm/scrails

Conflicts:
	divelog/app/models/user.rb
- user.rb conflict resolution