add r. thanks eli
Merge branch 'master' into mac
blah
added solarized
Merge branch 'master' into mac
Merge branch 'mac' into trip/mac