map
Merge branch 'master' of github.com:iliastsangaris/Argos into map
basic search working
Merge branch 'master' of github.com:iliastsangaris/Argos
Merge branch 'master' into map
Merge pull request #17 from zstayman/locator

Locator
user can get funding organizations for a company
added more stlying, fixed broken styles
map styling weird
Merge branch 'master' of github.com:iliastsangaris/Argos
styling wrong
fix map styling
fixed merge conflicts
Merge pull request #18 from iliastsangaris/map

Map
fixed crazy styling
user can see location of all funding orgs
Merge pull request #19 from iliastsangaris/getFundingOrgsLoc

user can see location of all funding orgs
fixed css
deploy
first pin dropped