commit index.js
Merge branch 'master' of https://github.com/nokia-wroclaw/innovativeproject-annonsurvey

Conflicts:
	routes/index.js