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
begin to move search results instatic html into angular
Merge pull request #19 from JakeRawr/master

add auth service test
refactor organization of SearchController and results directives
remove client-side test bundle from git, add to .gitignore
Merge branch 'master' into search-results
initial inclusion of angular-google-maps
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