add company scaffold
add better errors to beautify the error pages
merge Gemfile & Gemfile.lock