query
Merge branch 'master' of https://github.com/jonasoesch/Tyrannosearch

Conflicts:
	js/app.js