update
Merge branch 'gh-pages' of https://github.com/danieljjh/cooluoo into gh-pages

Conflicts:
	About.html
	Booking.html
	Features.html
	Index.html
	Portfolio.html
	Styles/img/2.png
	Styles/img/3.png
	Styles/img/7.png
	Styles/img/8.jpg
u