creating my own branch for testing
FactoryGirl instances
factory girl works.  yay.  doing a push before i leave and will do a merge so i can test all the other controllers and models
about to merge
Merge branch 'testing' into develop
fixed the -email has already been taken issue-.  Refer to Phil tomorrow about why rake db:migrate doesnt work
commit to show feather my most recent repo
update test files
tried updating gems
Fixed rake issue
Got guard and guard notification center working
update before merging with develop
Merge branch 'moretesting' into develop
friday merge