finishing touches
Merge branch 'master' of https://github.com/alixander/thorne_hackathon into 08-23b

not sure