add foundation
Merge pull request #1 from purple-martins-2013/add-foundation

add foundation
fix merge conflicts in gemfile
tweak gemfile.lock