Modified to common head.
Merge branch 'master' of github.com:shawntan/neural-turing-machines

Conflicts:
	train.py