working with commits
fixing merge conflict
Merge branch 'master' of github.com:daniel1bell/over-there
Merge branch 'master' of github.com:daniel1bell/over-there
hopefully hitting a merge conflict to fix