added foundation-rails
fixed imageurls
merge conflicts