JS tabs
Merge branch 'gh-pages' of https://github.com/yoni-mor/Web-App into gh-pages

Conflicts:
	css/main.css
	index.html
	js/main.js
	js/plugins.js