.
Merge branch 'master' of https://github.com/alekh/vowpal_wabbit
.
Merge branch 'master' of https://github.com/alekh/vowpal_wabbit

Conflicts:
	vowpalwabbit/nn.cc