zomg...
Merge pull request #9 from bkardell/master

arg... web editor, phones, rushing...