Pic
Merge branch 'master' of https://github.com/manavsGit/Intro-to-Web-Summer-2014

Conflicts:
	Manav/index.html