merging with master
merged and puled with master
redone some stuff
stuff
updated button styling
Merge pull request #29 from scottsilveus/design

Design