Merge branch 'pages'
Merge branch 'gh-pages'
Deleted Cloned Copies from gh-pages
Update README.md
Conflict fixing. Merge branch 'gh-pages'

Conflicts:
	calendarmapper.html
	css/page2style.css
	index.html