re
Merge branch '131113' of https://github.com/binensky/Dijkstra into 131113
before mer
merge