getting there
merging

Merge branch 'master' of github.com:einarhjorleifsson/rices

Conflicts:
	readme.md