Add sprockets
edit and new styling
Merge branch 'master' into kirby
trying to solve merge conflict
Merge pull request #12 from kmekler/kirby

Kirby - edit and new styling