Merge pull request #1 from masidonion/master

Sets up skeleton
add rspec file templates
Merge pull request #2 from danielleadams/color_landing_page

add rspec file templates
create schema
first features test for colors
add user story--AAU I want to write down how I'm feeling
add factory girl gem and consolidate spec helpers
-add shoulda/fg/faker/capy/selenium/dbcleaner test group
-change database gem from sqlite to pg
swap sqlite3 database.yml format with pg db.yml
add set up
"compatify" spec_helper file with  factory girl settings
create factory colors for features tests
wip
wip
WIP
reconcile gemfile environment differences to resolve capybara circular require error
reconcile gemfile environment differences to resolve capybara circular require error
pluralize colors controller
pluralize stories controller
update db schema