xml created and database changes complete
Merge branch 'danny'

Conflicts:
	data/attractions.sql