Preparing for context chagne
Merge branch 'master' of github.com:gadauto/MakingAFriend
Context changes are working