updated 3:40
Merge branch 'master' of github.com:NikhilGeorge/amazingproject

Conflicts:
	index.html
updated 3.45