added button functionality
fixing merge problems
fixed merge
Merge pull request #4 from FC-Chaps/mergetest

Mergetest