Merge branch 'master' of gogs.informatik.hs-fulda.de:srieger/cloud-computing-msc-ai-examples
# Conflicts:
# aws-cloudformation-demo/cloudcomp-counter-demo-with-vpc-designer.png
# aws-cloudformation-demo/cloudcomp-counter-demo-with-vpc.json
# aws-cloudformation-demo/cloudcomp-counter-demo.json
# aws-turnserver/stop.py
# example-projects/counter-demo/aws-cloudformation-demo/cloudcomp-counter-demo-with-vpc-designer.png
# example-projects/counter-demo/aws-cloudformation-demo/cloudcomp-counter-demo-with-vpc.json
# example-projects/counter-demo/aws-cloudformation-demo/cloudcomp-counter-demo.json
# example-projects/counter-demo/aws-cloudformation/cloudcomp-counter-demo-with-vpc-designer.png
# example-projects/counter-demo/aws-cloudformation/cloudcomp-counter-demo-with-vpc.json
# example-projects/counter-demo/aws-cloudformation/cloudcomp-counter-demo.json
# example-projects/tug-of-war-in-the-clouds/stop.py
# example-projects/turnserver/aws-boto3/start.py
# example-projects/turnserver/aws-boto3/stop.py
|