implemented simple CRUD for snippets model
fixed merge conflicts
Merge pull request #7 from abcm1989/master

fixed merge conflicts and CRUD for snippet model
pulled upstream code so I can work with snippet views
cheatsheet views set up
Merge pull request #8 from postmodem/Cheatsheets

cheatsheet views set up
code editor added and working
Merge branch 'master' of https://github.com/woolly-bear-caterpillars-2014/snippets into code-editor
merging with upstream
Merge pull request #9 from kabrewer07/code-editor

Code editor
created features folder in spec directory
Merge pull request #10 from acjetnut/master

created features folder in spec directory
Minor formatting fixes
Remove --warning from .rspec file. Uncommented the user_spec code and added an end so that rspec could run.
Merge pull request #11 from eddiekimosabe/snippets_spec

Remove --warning from .rspec file. Uncommented the user_spec code and ad...
setup capybara, no temper tantrums from machine
Merge branch 'master' of https://github.com/woolly-bear-caterpillars-2014/snippets into capybara-setup
Merge pull request #12 from eddiekimosabe/capybara-setup

Capybara setup
Minor formatting fixes
Minor formatting fixes