add foundation
fixed gemfile merge conflict
Merge pull request #8 from townegr/add_foundation

add foundation