sets up the most basic of cucumber examples, I will be working on more later. Working on #26
trying to get git to ignore database.yml
Merged in user_stories branch
fixing a bug from a merge with user stories branch
fixing another bug from the merge from user stories to master
Merged in master
Added new features and modified user factories
Merge branch 'master' into user_stories
Fixed feature bugs and modified user factory
added some rspec to user_spec
Ryan merging admin branch