remove bootstrap and add foundation
fix merge conflict