DinaSaad/sharesoft-13 — pull request #90 by BeshoSmile (2013-03-29 22:11:15+00:00)
Title: resolve the conflict and added my code

@Tharwat7