Added csci1200 container for testing
Fixed default timezone bug
Merge branch 'develop'