Merge pull request #2 from henrii/master

Update to folder structure of the web application
some css
Merge remote-tracking branch 'upstream/master'

Resolved conflicts:
	WebContent/view/home.html
	WebContent/view/search_results.html