Merge pull request #27 from mplaza/melabranch

Melabranch
added foundations and fixed some asset files
trying to add a foundation switch
resolved merge conflicts
cleaned up assets, deleted unnecessary files, modularized js
Merge pull request #28 from mplaza/paulbranch

Paulbranch
deleted more unnecessary files
Merge pull request #29 from mplaza/master

Merge pull request #28 from mplaza/paulbranch
Merge pull request #30 from mplaza/paulbranch

Paulbranch
deleted node module folder, last delete i swear
Merge branch 'master' into paulbranch
Merge pull request #31 from mplaza/paulbranch

Paulbranch
added D3 charts
Merge pull request #32 from mplaza/paulbranch

added D3 charts
adding targets
added angular foundation
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