Fixing javascript
This should update JavaScript
Merge branch 'master' of https://github.com/KhalidRich/NSBEHairSOS

Conflicts:
	static/css/bootstrap.css
	templates/index.html~e26f6b530cde0501f9036484473d2b82e0440264
Merge branch 'master' of https://github.com/KhalidRich/NSBEHairSOS