functionality changes
Merge branch 'master' of https://github.com/puddi/ideasturm

Conflicts:
	js/script.js