End of the models (except for the search methods)
Merge branch 'master' of https://github.com/Okhoshi/UCL_LINGI2255

Conflicts:
	.idea/workspace.xml