j
Revert "j"

This reverts commit 3c9720f5850e20c5aab468ab66d3a56e0b00faec.
Merge remote-tracking branch 'origin/master'
pusch
merge Mike and Dave
app.rb
fixed routing
fixed editDirector and createDirector Routing