major changes
:wqMerge branch 'master' of https://github.com/waseemkhan96/charitme

Conflicts:
	templates/index.html