FIXING MERGE CONFLICT
Merge branch 'master' of https://github.com/KhalidRich/NSBEHairSOS
Merge branch 'master' of https://github.com/KhalidRich/NSBEHairSOS
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 pull request #6 from KhalidRich/yelp

Added Map javascript
Merge branch 'master' of https://github.com/KhalidRich/NSBEHairSOS
Merge branch 'master' of https://github.com/KhalidRich/NSBEHairSOS
Merge branch 'master' of https://github.com/KhalidRich/NSBEHairSOS
Did templating stuff for pages
This is the search results page without data
updated the html of the map page w/o data
Merge pull request #7 from KhalidRich/real

This is the search results page without data
Map implimented