Added rails-erd
Merge branch 'master' of github.com:stevemcquaid/cmunity

Conflicts:
	Gemfile.lock

Temp Stash
Merge branch 'style' into sean