added non-functional button
added textbox
merged
Merge pull request #25 from markableidinger/test

Test