resolving merge issues
Merge pull request #68 from jsum528/LJK/buttons

resolving merge issues