changed broken test to pending
Merge pull request #20 from acjetnut/feature-testing

changed broken test to pending
added travis-ci image to README
Merge pull request #21 from acjetnut/feature-testing

added travis-ci image to README
Add styling to index page
Merge branch 'master' of https://github.com/woolly-bear-caterpillars-2014/should-i-send-this into styleguide
Merge pull request #22 from leeju/styleguide

Add styling to index page
Merge branch 'master' into color-palette
merge in justin;s changes and refactor / work on front end:
refactor justins design, extract variables, move hard coded stuff to public controller, colorvars and partials, unfinished but good start