Admin works
Admin works
Admin working
Merge branch 'master' of https://github.com/sabusa/comp4711_zurich

Conflicts:
	application/config/autoload.php
	application/config/config.php
	application/config/database.php
	application/config/routes.php
	application/controllers/admin.php
	application/controllers/eat.php
	application/controllers/play.php
	application/controllers/sleep.php
	application/controllers/welcome.php
	application/core/MY_Controller.php
	application/models/attractions.php
	application/models/attractions_array.php
	application/models/jumps.php
	application/views/_fields/fileupload.php
	application/views/_fields/x_submitted2.php
	application/views/_template.php
	application/views/admin.php
	application/views/category.php
	application/views/edit.php
	application/views/homepage.php
	application/views/justone.php
	assets/css/style.css
	nbproject/private/private.xml