add foundation grid, updated styles
removed items that will be added in the second step of the exercise
fix merge conflicts