voting completed
Merge branch 'master' of https://github.com/vimuth/house-allocation

Conflicts:
	modules/dataservice.jag