Merge branch 'Mike' into Lauren
continent getters and setters
Merge remote-tracking branch 'origin/Lauren' into Mike
up to date