change
Merge branch 'master' of https://github.com/skeep/weinberg

Conflicts:
	README.md
chnage in list