Readme adjusted
Merge branch 'master' of https://github.com/charifmews/oblie

Conflicts:
	client/templates/hello.html
new file config1.js
Merge branch 'master' of https://github.com/charifmews/oblie