bla
Merge branch 'master' of https://github.com/PPWA/textsearchapp.git

Conflicts:
	BreakingNews/public/javascripts/index.js
	BreakingNews/public/stylesheets/main.css