Done writing model stuff, test now!
Merge branch 'master' of https://github.com/somanayr/LSP.git

Conflicts:
	model.py