changed some lines
deleted some stuff
improved the storyboard
Merge branch 'master' of https://github.com/pavedwalden/git_exercise
This is important because our code base needs to work together rather than fight one another as it has seemingly been doing.