pulling from htmlMocks
Merge branch 'htmlMocks' of https://github.com/DrivewayHunt/DrivewayHunt
ready to pull first angular changes
Merge branch 'master' of https://github.com/DrivewayHunt/DrivewayHunt
google map shown
Merge pull request #23 from JakeRawr/search-results

google map shown
finished login/signup modals
Updated Index for Angular group
merged after modals
corrected syntax errors and gitignore
fixed gruntfile for karma
Merge pull request #24 from taiga418/master

Login/signup modals done
merge upstream new css for index.html
merge conflict
removed manifest .css
merged upstream
Merge pull request #25 from lolanysf/master

updated sass styles for index
make map visible with styling
merge upstream
remove setting of second cookie