attempting to add railway
Fixed errors in railway branch

Merge branch 'master' into railway

Conflicts:
	web/result.php