New layouts
Merge branch 'master' of https://github.com/gwtrains/node-train-data

Conflicts:
	index.js