changed visual formatting, added table, combined django calendar objects with google calendar objects