Added license
Merge branch 'master' of github.com:jlleblanc/reveal-server

Conflicts:
	README.mdown