Preparing to merge classy into master
Merge remote-tracking branch 'upstream/classy' into classy
Merge pull request #70 from mnfienen/classy

Classy