a
Merge remote-tracking branch 'mlh/master'

Conflicts:
	src/MachineLearningHeights.pro.user
Changed pro.user config
useless changes
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/MachineLearningHeights.pro.user
AImplemented buggy linear regression. Needs to be fixed ASAP. Also added some regression data to see model on rails.