Merge branch 'master' of https://github.com/Integ/glouno

Conflicts:
	README.md
fix readme

fix readme