Added OtherUser class and made some chagnes to the Calendar class