Adding some quick commentary.
Removing an obvious inheritance and replacing with has-a relationship
Moving something into a model package
Merge branch 'slick' of https://github.com/UnicodeSnowman/spray-template into slick

Conflicts:
	src/main/scala/com/example/Coffee.scala
Merge branch 'slick' of https://github.com/UnicodeSnowman/spray-template into slick

Conflicts:
	src/main/scala/com/example/Coffee.scala