;)
Merge branch 'master' of https://github.com/daslicht/express-swig-example

Conflicts:
	README.md