change from laptop
Merge branch 'master' of https://github.com/waywho/nomster

Conflicts:
	README.rdoc