Added basic data types (sections & users)
added wildcard to ignore all lock files
Untracked gemfile.lock
minor minor changes
sprint 1 changes - added homepage & user model
fixed merge issues
Merge pull request #4 from Raytray/development

.gitignore to ignore lock files.
Slight update to key files
add database.yml to gitignore

Will need to use personal setups for mysql servers
https://github.com/cowboyd/therubyracer/issues/215
Merge pull request #5 from Raytray/development

https://github.com/cowboyd/therubyracer/issues/215
added 'annotate' gem for model annotations
completed 'user' model & associated tests (Ch. 6)
Added regexp for virginia emails, added tests for it into spec as well
Merge pull request #6 from Raytray/development

Added regexp for virginia emails, added tests for it into spec as well
Removed secret token from versioning
Removed secret token from versioning
Merge pull request #7 from Raytray/development

Development
added to users model & registration page
Merge branch 'development' of github.com:thecourseforum/theCourseForum into development

Conflicts:
	app/models/user.rb