Primary key is first; Mark unique attribute - U, primary key - PK, foreign key - FK
Fix rails4 Error: undefined method 'type_description' for nil:NilClass
ignoring .ruby-* files
adding in color support from railroady
fixing the sort order in the test
ignoring rvm files
Merge branch 'adding_color_support'

Conflicts:
	.gitignore
adding color scheme to edge attributes
Merge branch 'adding_color_support'
Merge branch 'master' of github.com:lsanchez-r7/rails-erd