Merge pull request #28 from r3bhatta/master

fixed import errors
Fixed NBC to take training folders as input.
Small fix.
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.
Initial commit for the trainer tool
Merge pull request #30 from dmilisav/master

Initial commit for the trainer tool.
pre pull commit
Merge branch 'master' of https://github.com/rhuang/semantix
tiny fix to add os path back in so that main.py still works