richardzg pull request

fixed conflicts and added Tunisia.html