sprint 3
Merge pull request #1 from shahvic/spint3

sprint 3