fixing bugs

fix #7
Revert "fixing bugs"

This reverts commit aa75f24f51b04c91384c88be9cb83d7d4ae39173.
fixing bugs

fix #7
working on #8
impelmenting #3

close #3
Revert "impelmenting #3"

This reverts commit a458493f7b9d96b27419efb11cf35d05c1918f27.
working on bug2

#7
fix #7
Revert "Revert "impelmenting #3""

This reverts commit 861a934aa8c49c9e8c0720e00af902e210d1a44d.
Revert "Revert "Revert "impelmenting #3"""

This reverts commit 2a8a2b2ff1b7a88fe49935968b9d6dac41d2e14c.
Merge remote-tracking branch 'origin/branch1'