Moved files around
Merge branch 'master' of github.com:dkothari777/Hackathon2014

Conflicts:
	index.html