Merge branch 'Mike' into Lauren
continent getters and setters
Merge branch 'Lauren' into Joe