added gem zurb-foundation
Merge branch 'master' of github.com:CMEP/webng

Conflicts:
	app/assets/images/bg.png
	app/assets/javascripts/application.js
	app/assets/stylesheets/application.css
	app/views/layouts/application.html.erb
	app/views/welcome/index.html.erb