file check
Merge branch 'psathyrella' of github.com:psathyrella/ham into psathyrella

Conflicts:
	src/model.cc