conflicts removed
Merge branch 'master' of https://github.com/SaddaHaq/SH_Changemakers