f'd up
adding a comment
Merge branch 'master' of https://github.com/comamitc/miler-io

Conflicts:
	.cache
	app/lib/Deal.scala
2
Merge pull request #1 from robertsd/master

I recommend you "upgrade"
removing derrick
removing derrick