contribute 3 types and galleris
stuff-not sure this is is good
Merge branch 'master' of http://github.com/geomakers/geomakers

Conflicts:
	.gitignore
	README.md
	windwaker/windwaker/settings.py
contribute and index