add feature ticket1
Merge pull request #1 from jazminschroeder/ticket1

add feature ticket1