made some things appear and disappear, i am HOUDINI
Merge branch 'master' of https://github.com/adynak/naksha

Conflicts:
	indextemplate.html