merge conflict solved
Merge branch 'master' of https://github.com/Jaaga/crowdfund-scholarships