Merge branch 'master' of https://github.com/elmer-compiler/docker

Conflicts:
	elmer-json-compiler/Dockerfile

Author: vic

elmer-json-compiler/Dockerfile

@@ -7,6 +7,7 @@ RUN  curl https://s3.amazonaws.com/rebar3/rebar3 > /bin/rebar3
 RUN  chmod 755 /bin/rebar3
 
 RUN  git clone --depth 1 https://github.com/elmer-compiler/elm-platform.git
+
 RUN  cabal update
 RUN  cd /elm-platform/installers && runhaskell BuildFromSource.hs master