footer
Merge branch 'footer'
Merge branch 'master' of https://github.com/ataraxg/WebArena

Conflicts:
	app/tmp/cache/models/myapp_cake_model_default_webarena_fighters
	app/tmp/cache/models/myapp_cake_model_default_webarena_list
	app/tmp/cache/models/myapp_cake_model_default_webarena_players
	app/tmp/cache/persistent/myapp_cake_core_cake_dev_fr
	app/tmp/cache/persistent/myapp_cake_core_default_fr
	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/View_Arena.css