eclipse setting files
fixed simple test
Merge branch 'stage2' into stage3
Merge branch 'stage3' of github:sp1r1t/lab2 into stage3