model interlock
Merge branch 'master' of github.com:davecheney/ix

Conflicts:
	model.go