Commit User Setting and Search Box functions to home.html page;
Added user_settings.css and main.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	home.html
	js/main.js