Merge pull request #5 from kaleigh207/master

progress bar
Buttons