.
Merge branch 'listlattice' of github.com:pholda/discats into listlattice

Conflicts:
	core/src/main/scala/edu/agh/student/discats/ca/lattice/LatticeSwingApp.scala
Merge branch 'listlattice' of github.com:pholda/discats into listlattice