trying to improve performance
removes improper hash syntax from user show page
adds friendship model
merge conflict