Slapping down all the files I want.  Maybe they work...
Fixed everything
Merge branch 'master' of https://github.com/joescii/lift-test