Set up for intro
Merge branch 'master' of github.com:gadauto/MakingAFriend
Fixed commit