Local Copy Homepage Changed.
Conflict 1 Resovled b/w the local and remote file

Conflicts:
	Homepage.txt