stash-merge-fix
Rewriting phase2.cpp

-Erasing different strategies
-Simplifying a little bit
Changing values to stricter ones
More or less Proxima style
Merging 'shoot'