f
Merge branch 'master' of https://github.com/crygiova/Web_Intelligence

Conflicts:
	bin/ntnu/tdt4215/project/IOFileTxt.class
dd