syncsync
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/models/attractions.php
Merge branch 'master' of https://github.com/Okitora/Assignment-3