counter stuff
Merge branch 'master' into templating
resolve merge conflicts
resolve merge conflict
resolve conflicts
ignore logs
joey t 2
stylin'
joey t3
Merge branch 'templating' of github.com:CrossTheStreams/magneato into templating
cells
boom
Merge branch 'templating' of github.com:CrossTheStreams/magneato into templating
joey
a ton of styling stuff
resolve merge conflicts
latest and greatest styles and scripts
joey
joey
commit before merge