resolve conflicts on getting-started
rm swm file
Merge pull request #103 from shalako/master

moved services from getting-started to adding-a-service