Added contact page & edited links to contacts
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	html/MainPageNew.html
	html/World.html