many changes
Merge branch 'master' of https://github.com/tabebqena/Rockdome

Conflicts:
	MANIFEST
	TODO
	TODO~
	data/Add to RockDome
	data/rd
	data/rd.png
	setup.cfg
	setup.py
	uninstall.py