New input format for machine learning
Funny git problem
Merge branch 'master' of github.com:tbook/comp527-serversurvey

Conflicts:
	README.md
	serversurvey/baysian-analysis.py
	serversurvey/serverNames.py
	serversurvey/serversurvey/spiders/SurveySpider.py