Merge branch 'master' of git://github.com/Swoot1/foodz2
Sass and base template
removed server.pid
remove log that shouldn't have been comitted in the first place