here
Included Icon
Merge branch 'Navigation_Controls'

Conflicts:
	index.html
Merge branch 'master' of https://github.com/chris4459/web-diary