Merge branch 'master' of github.com:skevy/atlas-backend
removing commented code