edited view, technology.rb
Merge remote-tracking branch 'origin/master'