Basic classes but with lefotover code from lab 5
Merge remote-tracking branch 'choose_remote_name/master'