fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	Paris.html
Merge pull request #14 from BPAWebDev/master

update