Minor
Merge branch 'master' of https://github.com/DiNear/hack-adventure

Conflicts:
	search.js