models created
Merge branch 'search'
merge
Merge branch 'master' of github.com:iliastsangaris/Argos
fixed
Merge branch 'master' of github.com:iliastsangaris/Argos
seed file done
fixing
Merge branch 'master' of github.com:iliastsangaris/Argos
fixed merge conflicts
Merge branch 'zstayman-people-and-places'
Merge branch 'master' of github.com:iliastsangaris/Argos