updated gemfile.lock
updated units controller from merge conflicts
added image
changes