ADDED OS X settings to gitignore and DELETED duplicate README.rdoc
add user model and created migration
Merge pull request #1 from alex-zelikow/edit_metafiles

ADDED OS X settings to gitignore and DELETED duplicate README.rdoc
Merge pull request #2 from Simon245/usermodel

add user model and created migration
UPDATED gemfile
INSTALLED rspec
ADDED user_spec.rb.
REMOVED accidental 'User do' file.
ADDED test cases for email and password in user_spec.rb.
ADDED semantic-ui-rails gem.
ADDED before each / multiple expect / test protected methods.
REMOVED semantic-ui-rails gem.
Merge pull request #3 from annieccheung/user_spec

ADDED user_spec.rb.
ADDED database_cleaner.rb
UPDATED user spec