test commit
tags adding when snippet created
tag display under each snippet working
updated gitignore to add logs
fixing conflicts
merging with upstream
css fixes
Merge branch 'master' of https://github.com/woolly-bear-caterpillars-2014/snippets into tag-functionality
Merge pull request #38 from woolly-bear-caterpillars-2014/tag-functionality

Tag functionality
cheatsheet editor view
snippet logic on cheatsheet
Merge pull request #39 from woolly-bear-caterpillars-2014/cheatsheet-editor

Cheatsheet editor
tags on cheatsheet
snip_count for number of times Snippet is added

Snippets organized by snip_count on index page
controller stuff
fixed snippet controller merge conflicts
fixing code merge issues, errors
Merge pull request #41 from woolly-bear-caterpillars-2014/cheatsheet-editor

Cheatsheet editor
in progress styling
Merge pull request #42 from alextle0125/styling

in progress styling