first commit
Merging is necessary because I need to sync my online and laptop s/ directories.

Merge branch 'master' of https://github.com/gwdean/s