merging
changed and fixed buttons
fixed conflic
Merge pull request #37 from Eye-Static/eblbranch

Eblbranch