styled buttons
container margin bug fix
fix merge conflict
Merge pull request #30 from fox-squirrels-2013/pad_spike

Pad spike