fixed rspec dependencies
fixing merge conflicts
Merge pull request #69 from 4justinstewart/general_styles

General styles