test commit
Merge pull request #36 from alextle0125/cheatsheets

feature - cheatsheet instantiation on new user sign up
tags adding when snippet created
tag display under each snippet working
updated gitignore to add logs
fixing conflicts
Merge pull request #37 from alextle0125/routing

split routes depending on user login status
merging with upstream
pulling master
resolved .ds
Merge branch 'master' of https://github.com/woolly-bear-caterpillars-2014/snippets

Conflicts:
	log/development.log
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