Merge pull request #31 from mplaza/paulbranch

Paulbranch
added model validation and model testing
added side display for goal info and tooltip and styled homepage
Merge pull request #32 from mplaza/paulbranch

added D3 charts
adding targets
Merge pull request #33 from mplaza/paulbranch

added angular foundation
Merge branch 'master' of https://github.com/mplaza/mapwithcolor

Conflicts:
	Gemfile.lock
	app/assets/javascripts/worldmap.js
	app/assets/stylesheets/application.css.scss
	app/assets/stylesheets/foundation_and_overrides.scss
	app/models/fulldataset.rb
	app/views/worldmap/index.html.erb
	spec/spec_helper.rb
precompiled assets locally
precompiling
Merge pull request #34 from mplaza/melabranch

Melabranch
removed font
Merge pull request #35 from mplaza/melabranch

removed font
Merge pull request #36 from mplaza/master

fsadf