solved P=NP
Merge branch '1a'