ignore *.suo
merge
merge
Merge github.com:surban/Theano