added spec files and user with index
set up user login and user sessions
user login w/ tests
deleted files
merged upstream develop with local develop
fixing merge coflicts and clearing gemlock
fixed merge conflicts and got login working
add schema file change
pull down and resolve merge conflict
built out schema and basic models
fixed timestamp conflict in schema file
added dependency to user model
updated associations on models
created basic unit tests for models; continued mucking around with associations
edited readme name, added travis.yml
fixed spec/model merge conflict
fixed spec_helper requirement