adds brakeman gem
implemented brakeman, fixed errors, yay
ran flog
fixing conflicts