footing layout
merge conflicts
merge conflicts
layout changes
merge conflicts
Merge branch 'master' into foundation
minor changes to styling
styling
styling upgrades
merge conflicts
css styling changes
conflict changes
Merge branch 'master' of github.com:purple-martins-2013/Sports-Spike
Merge branch 'master' into foundation
merge confirmation
Merge pull request #30 from purple-martins-2013/foundation

Foundation