For merging.
Merge branch 'master' of https://github.com/wojzaremba/rnn

Conflicts:
	main.py