merge commit
Merge branch 'develop' of https://github.com/mlee284045/sidebar into develop
Merge pull request #3 from mlee284045/pat

Pat