commit workspace
Merge branch 'master' of https://github.com/imouto1994/CS3246-Assignment-1

Conflicts:
	.idea/workspace.xml
modify the weights
change back the distance formula
Merge branch 'master' of https://github.com/imouto1994/CS3246-Assignment-1

Conflicts:
	.idea/workspace.xml