models created
Merge branch 'search'
merge
Merge branch 'master' of github.com:iliastsangaris/Argos
fixed
Merge branch 'master' of github.com:iliastsangaris/Argos
trying to add markers
seed file done
fixing
Merge branch 'master' of github.com:iliastsangaris/Argos
fixed merge conflicts
Merge branch 'zstayman-people-and-places'
Merge pull request #12 from iliastsangaris/APIHelpers

Api helpers
Merge branch 'master' of github.com:iliastsangaris/Argos
merging w/ tai
Merge branch 'map'
rebasing
Merge commit '2909eac'
Get trending funded companies