pull changes
pull changes
conflict removed from application
added reputation page and updated the code
conflict removed from gem file