Merge branch 'master' into work
# Conflicts:
#	Dockerfile
commit 25aa127e46d009d3d3224d6c58528189158ca675
2 parents 1f965a8 + 6538603
@haya4 haya4 authored on 17 Nov
Showing 2 changed files
View
Dockerfile
View
README.md