initial rspec setup
fixed merge conflict
Merge branch 'brandonjyuhas-master'
fixed merge conflict
everything but controllers
avoiding merge conflict
Merge branch 'controller-setup'
getting seeds file
fixed more merge conflicts
Merge branch 'brandonjyuhas-master'
fixed merge conflicts