Added Cell class, made fields private
Merge remote-tracking branch 'origin/master'