Going through changes
Merge branch 'master' of https://github.com/bedashii/ReturnMedz