first commit
Merge branch 'master' of https://github.com/ulicoin/ulicoin

Conflicts:
	README.md

	modified:   README.md