Merge branch 'master' into abstract-erd

Conflicts:
	Gemfile.lock
	spec/spec_helper.rb

diff --cc Gemfile.lock
index 8d44c452abb6e42cf6b926b422b2bf2067c7d10b,8cec60c0532a8c96a17792af14ba7ccfdd24a076..0a4459e6557a79649e653742171ab8a41dab22b8
--- 1/Gemfile.lock
--- 2/Gemfile.lock
+++ b/Gemfile.lock
@@@ -2,9 -2,10 +2,11 @@@ GE
    remote: http://rubygems.org/
    specs:
      diff-lcs (1.1.3)
 -    graph.njae (0.2.3)
 +    graph.njae (0.2.4)
      json (1.6.5)
+     multi_json (1.3.6)
+     porter2stemmer (1.0.0)
 +    porter2stemmer (1.0.1)
      rake (0.9.2.2)
      rdoc (3.12)
        json (~> 1.4)

diff --cc spec/spec_helper.rb
index d10b8b13acb00391dffa4511889f7185687be39f,d0c7f1a3ee4762dc60a7bd38f996e4b6d4d3f996..b54e9f5ce10e24e397be2c9244293cf9f2862fd1
--- 1/spec/spec_helper.rb
--- 2/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@@ -1,1 -1,10 +1,4 @@@
 -require 'rexml/document.rb'
 -include REXML  
 -
 -require 'graph.njae'
 -include GraphNjae
 -
+ require 'simplecov'
+ SimpleCov.start
+ 
  require 'erd_handler'