changed promise
Starting on scratch, again
Merge branch 'task-1-solution' into task-1