add sails project
solve conflict readme