Merge pull request #8 from pablobcb/master

Nginx using chapelle.lua
Remove and ignore logs
Add logs folder back to git
Fix typo on nginx.conf
Move temp files elsewhere than working dir
Merge branch 'master' of github.com:adelgado/chappelle

Conflicts:
	logs/error.log