Complete
Merge branch 'master' of https://github.com/rishabhjain2795/MHacks

Conflicts:
	new approach/master.html