fixed merge issue
Merge branch 'master' of https://github.com/Anzumana/theprojectcast

Conflicts:
	index.html