Almost done, just need extra links on welcome page

Edited deimos data for a mroe detailed view
Eat now displays deimos cafe in detail
Play does a quick summary of the mars factory
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/models/attractions.php
	application/views/sleep.php
	application/views/welcome.php