all proposals from laptop
merge
Merge branch 'master' of https://github.com/sdhawan21/proposals

Conflicts:
	README.md