tags on cheatsheet
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