updated config, and foo
Merge branch '1'
solved P=NP
Merge branch '1a'
adsfasdf
Merge branch '2'
adsf
Merge branch '2a'
Merge remote-tracking branch 'origin/master' into test