merge
merge
Merge branch 'server' of https://github.com/katarinakyh/cc7 into server
fixing comments