Back to normal
merging
fixing merge issues
Merge branch 'master' of https://github.com/DivingDeveloper/DivingDeveloper.github.io

Conflicts:
	.DS_Store
	index.html