Testable Version
fixed
update
readded previous
Merge branch 'develop'

Conflicts:
	index.html
	res/css/search_engine.css