map
Merge branch 'master' of github.com:iliastsangaris/Argos into map
Merge branch 'master' into map
map styling weird
styling wrong
fix map styling
fixed merge conflicts
Merge pull request #18 from iliastsangaris/map

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

user can see location of all funding orgs
fixed css
deploy
Merge branch 'master' of github.com:iliastsangaris/Argos
first pin dropped
Merge pull request #20 from zstayman/locator

first pin dropped
front page working and updated stlying
fixed merge conflicts