edit cause
edit cause
Merge branch 'master' of https://github.com/jgenso/causes
edit cause
Merge branch 'master' of https://github.com/jgenso/causes

Conflicts:
	src/main/scala/code/model/Cause.scala
edit cause
Merge branch 'master' of https://github.com/jgenso/causes