Small changes to main.py and to UnitTests to adhere to new folder
structure
Merge branch 'master' of https://github.com/rhuang/semantix

Conflicts:
	app/main.py
	app/naivebayesclassifier/naivebayesclassifier.py
Merge pull request #29 from dmilisav/master

Small changes to main.py and UnitTests to adhere to new file structure.