indentare
adaugat:
  - css/search.css
  - js/searchBar.js
  - views/search.html
Merge remote-tracking branch 'origin/bogdan' into valentin

Conflicts:
	src/main/webapp/views/index.html
Merged with bogdan