implemented remove card; cleaned code; added new logo
fixed merge conflits