chappelle sh now manages the server
chapelle manager
Merge branch 'master' of github.com:adelgado/chappelle

Conflicts:
	logs/error.log
Merge pull request #9 from pablobcb/master

sh for starting and stopping nginx