Updated main with test function, added preprocessing file
Merge remote-tracking branch 'origin/master'

Conflicts:
	main.py
	util.py