added a line
added another line
removed first line
added development category
added last line
Merge branch 'development'

Conflicts:
	README.md