Adding A*
Merging
Added A* that doesnt work
Merge remote-tracking branch 'origin/master'