Merging master
Merge branch 'master' of https://github.com/timkendall/msc into remotemerge

Conflicts:
	app.js
	bayesclassifier.js
Merge
Merge branch 'master' of https://github.com/timkendall/msc
merge
Finalized the training and classification