Added 4+1 and Logic - small changes in Accepttest
Added a png
Merge
Small fixes in some files