2014-6-2 18:30
Merge branch 'master' of https://github.com/maurice60/Scala-EPL

Conflicts:
	patmat/.idea/workspace.xml
	patmat/project/project/target/streams/$global/update/$global/out
	patmat/project/target/streams/$global/update/$global/out

patmat/submission/target/resolution-cache/progfun-patmat/progfun-patmat$
sbt_2.10/1.0.0/resolved.xml.properties

patmat/submission/target/resolution-cache/progfun-patmat/progfun-patmat$
sbt_2.10/1.0.0/resolved.xml.xml

patmat/submission/target/resolution-cache/progfun-patmat/progfun-patmat$
sources_2.10/1.0.0/resolved.xml.properties

patmat/submission/target/resolution-cache/progfun-patmat/progfun-patmat$
sources_2.10/1.0.0/resolved.xml.xml

patmat/submission/target/resolution-cache/progfun-patmat/progfun-patmat$
sources_javadoc_2.10/1.0.0/resolved.xml.properties

patmat/submission/target/resolution-cache/progfun-patmat/progfun-patmat$
sources_javadoc_2.10/1.0.0/resolved.xml.xml

patmat/submission/target/resolution-cache/reports/progfun-patmat-progfun
-patmat$sbt_2.10-default.xml

patmat/submission/target/resolution-cache/reports/progfun-patmat-progfun
-patmat$sources_2.10-default.xml

patmat/submission/target/resolution-cache/reports/progfun-patmat-progfun
-patmat$sources_javadoc_2.10-compile-internal.xml

patmat/submission/target/resolution-cache/reports/progfun-patmat-progfun
-patmat$sources_javadoc_2.10-compile.xml

patmat/submission/target/resolution-cache/reports/progfun-patmat-progfun
-patmat$sources_javadoc_2.10-docs.xml

patmat/submission/target/resolution-cache/reports/progfun-patmat-progfun
-patmat$sources_javadoc_2.10-optional.xml

patmat/submission/target/resolution-cache/reports/progfun-patmat-progfun
-patmat$sources_javadoc_2.10-plugin.xml

patmat/submission/target/resolution-cache/reports/progfun-patmat-progfun
-patmat$sources_javadoc_2.10-pom.xml

patmat/submission/target/resolution-cache/reports/progfun-patmat-progfun
-patmat$sources_javadoc_2.10-provided.xml

patmat/submission/target/resolution-cache/reports/progfun-patmat-progfun
-patmat$sources_javadoc_2.10-runtime-internal.xml

patmat/submission/target/resolution-cache/reports/progfun-patmat-progfun
-patmat$sources_javadoc_2.10-runtime.xml

patmat/submission/target/resolution-cache/reports/progfun-patmat-progfun
-patmat$sources_javadoc_2.10-sources.xml

patmat/submission/target/resolution-cache/reports/progfun-patmat-progfun
-patmat$sources_javadoc_2.10-test-internal.xml

patmat/submission/target/resolution-cache/reports/progfun-patmat-progfun
-patmat$sources_javadoc_2.10-test.xml
	patmat/submission/target/streams/$global/update-classifiers/$global/out

patmat/submission/target/streams/$global/update-sbt-classifiers/$global/
out

patmat/target/resolution-cache/progfun-patmat/progfun-patmat$sbt_2.10/1.
0.0/resolved.xml.properties

patmat/target/resolution-cache/progfun-patmat/progfun-patmat$sbt_2.10/1.
0.0/resolved.xml.xml

patmat/target/resolution-cache/progfun-patmat/progfun-patmat$sources_2.1
0/1.0.0/resolved.xml.properties

patmat/target/resolution-cache/progfun-patmat/progfun-patmat$sources_2.1
0/1.0.0/resolved.xml.xml

patmat/target/resolution-cache/progfun-patmat/progfun-patmat$sources_jav
adoc_2.10/1.0.0/resolved.xml.properties

patmat/target/resolution-cache/progfun-patmat/progfun-patmat$sources_jav
adoc_2.10/1.0.0/resolved.xml.xml

patmat/target/resolution-cache/reports/progfun-patmat-progfun-patmat$sbt
_2.10-default.xml

patmat/target/resolution-cache/reports/progfun-patmat-progfun-patmat$sou
rces_2.10-default.xml

patmat/target/resolution-cache/reports/progfun-patmat-progfun-patmat$sou
rces_javadoc_2.10-compile-internal.xml

patmat/target/resolution-cache/reports/progfun-patmat-progfun-patmat$sou
rces_javadoc_2.10-compile.xml

patmat/target/resolution-cache/reports/progfun-patmat-progfun-patmat$sou
rces_javadoc_2.10-docs.xml

patmat/target/resolution-cache/reports/progfun-patmat-progfun-patmat$sou
rces_javadoc_2.10-optional.xml

patmat/target/resolution-cache/reports/progfun-patmat-progfun-patmat$sou
rces_javadoc_2.10-plugin.xml

patmat/target/resolution-cache/reports/progfun-patmat-progfun-patmat$sou
rces_javadoc_2.10-pom.xml

patmat/target/resolution-cache/reports/progfun-patmat-progfun-patmat$sou
rces_javadoc_2.10-provided.xml

patmat/target/resolution-cache/reports/progfun-patmat-progfun-patmat$sou
rces_javadoc_2.10-runtime-internal.xml

patmat/target/resolution-cache/reports/progfun-patmat-progfun-patmat$sou
rces_javadoc_2.10-runtime.xml

patmat/target/resolution-cache/reports/progfun-patmat-progfun-patmat$sou
rces_javadoc_2.10-sources.xml

patmat/target/resolution-cache/reports/progfun-patmat-progfun-patmat$sou
rces_javadoc_2.10-test-internal.xml

patmat/target/resolution-cache/reports/progfun-patmat-progfun-patmat$sou
rces_javadoc_2.10-test.xml
	patmat/target/scala-2.10/classes/patmat/Huffman$.class

patmat/target/scala-2.10/test-classes/patmat/HuffmanSuite$$anonfun$7$$an
on$4.class
	patmat/target/streams/$global/update-classifiers/$global/out
	patmat/target/streams/$global/update-sbt-classifiers/$global/out