FINALLY - consolidated set of files
Merge branch 'master' of github.com:aleaf/SFR