added friends name to Design for Use show view
fixed conflicts
Merge branch 'master' of https://github.com/rach7110/Made-in-ATX-2 into crunchbase