adding new files
Merge branch 'master' of https://github.com/mikeycattell/Portfolio

Conflicts:
	michaelcattell/templates/about.liquid
	michaelcattell/templates/argos.liquid
	michaelcattell/templates/hotelsinleeds.liquid
	michaelcattell/templates/includes/navigation.liquid
	michaelcattell/templates/includes/navigation_sub.liquid
	michaelcattell/templates/michaelandemmasayido.liquid
	michaelcattell/templates/smallpeeps.liquid