Skip to content
Commit f1c4c621 authored by Alexandra Skyslakova's avatar Alexandra Skyslakova
Browse files

Merge branch 'milestone-03' into readme-update 

# Conflicts:
#	README.md
parents 775a36c2 784bcbf6
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment