putting things together
Merge pull request #52 from nejc92/master

putting things together