Change map img
Change title
Merge branch 'master' of https://github.com/wendycan/my_history

Conflicts:
	index.html