changed conf.py
moved sources to sub folder and changed output folder to root
built
added
Merge branch 'master' into gh-pages

Conflicts:
	.doit.db
	SOURCE/conf.pyc
	SOURCE/galleries/index.html
	listings/index.html
	output/listings/index.html
updated