premerge - moved my folder so no real changes
reverted to 46c866c -- Andy's latest changes
Merge branch 'classy' of github.com:mnfienen/SFR into classy
Merge pull request #60 from mnfienen/classy

Classy