Merge remote-tracking branch 'mike/master'
deleted addgame and edit status since we re out of time. there are a lot
of thing need to be done
Merge remote-tracking branch 'LOU/master'