initial
Merge branch 'dev' of github.com:jkempff/make-static into dev

Conflicts:
	server.js