Finished story trello_44
Merge pull request #21 from GonzoGhanem/trello_46

Finished story trello_44