description
description of readme
Merge remote-tracking branch 'origin/dev-20130423-readme'

Conflicts:
	README.md