home, homesession et you're dead

j'ai fait cees pages en mode belles mais il y a des erreurs sur la page
you're dead qui etaient déjà la avant mais je ne sais pas les enlever
donc voila
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/Controller/ArenaController.php
	app/webroot/css/monCss.css
Merge branch 'master' of https://github.com/camillev/Coat-of-Arms

Conflicts:
	app/Controller/ArenaController.php
	app/nbproject/private/private.xml
	app/tmp/cache/models/myapp_cake_model_default_arenaweb_events
	app/tmp/cache/models/myapp_cake_model_default_arenaweb_fighters
	app/tmp/cache/models/myapp_cake_model_default_arenaweb_list
	app/tmp/cache/models/myapp_cake_model_default_arenaweb_players
	app/tmp/cache/models/myapp_cake_model_default_arenaweb_surroundings
	app/tmp/cache/persistent/myapp_cake_core_cake_dev_en-us
	app/tmp/cache/persistent/myapp_cake_core_default_en-us
	app/tmp/cache/persistent/myapp_cake_core_file_map
	app/tmp/cache/persistent/myapp_cake_core_method_cache
	app/tmp/logs/error.log
	app/webroot/css/monCss.css