error handling foo
Merge branch 'development' of https://github.com/racker80/cloud-launch-guide into development

Conflicts:
	index.php