Added some debugging output + roads instead of neighbours
Merge branch 'master' of github.com:2014-codeteam/2014-codeteam

Conflicts:
	main/parser.py