added config/environments/production.rb to .gitignore
why the f*ck are these asset files wanting to get checked in?
fixed git merge issue
updated gitignore to remove public/assets
Merge branch 'master' of https://github.com/prpatel/frab
Merge branch 'master' of https://github.com/prpatel/frab
Merge branch 'master' of https://github.com/prpatel/frab