Placeholder things

commented out
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/simpleSearch.js