RESET PROJECT
Merge branch 'master' of https://github.com/a-gradim/PathFinder_2014
RESET project1