Commit work completed before I reload files
Added mockup to 234.
Merge branch 'master' of https://github.com/davincicoders/2014-t1-ruby
Wrong color edge for find_by.
Merge branch 'master' of github.com:davincicoders/2014-t1-ruby
Merge branch 'master' of https://github.com/davincicoders/2014-t1-ruby
Exercise 226 Edit Presidents
Merge branch 'master' of https://github.com/davidmowrer/2014-t1-ruby

Conflicts:
	209-world-cities/db/schema.rb
	209-world-cities/db/seeds.rb
	209-world-cities/views/index.html.erb
	211-elements-details/controller.rb
	211-elements-details/views/index.html.erb