our fancy commit
Merge pull request #6 from lotemh/stasIsTheKing

our fancy commit