fix cardis mistake
Merge branch '2012' of github.com:antistatique/antistatique into 2012
update team page