Commiting Needle's Changes
Getting rid of merge conflicts
Merge pull request #3 from zainadil/Zain

Commiting Needle's Changes