changed port to 8080
removed the redundant twitter and Facebook buttons
Merge branch 'master' into develop

Conflicts:
	index.html
corrected indentation