Current naive version with a nice heuristic (+ little change to djikstra)
Merge branch 'master' of github.com:2014-codeteam/2014-codeteam