Merge pull request #97 from blind-squirrel/Sharon

Sharon
format changes. ignore pulbic/uploads/ files