background
fixed conflicts
Merge pull request #21 from bjlinville1/master

more workflow
minor style change
Merge branch 'master' of github.com:TIY-Q3-ROR-CHS/Team3
added friendships index to welcome controller
Merge pull request #22 from belindahare/master

added friendships index to welcome controller
working through broken app bugs
workspace.xml merge error fix
fixing poor merges
merge conflict fix
Merge pull request #23 from Mathdrquinn/master

i hope we're almost there
merge error corrections to index and workspace.xml files
Merge pull request #24 from belindahare/master

corrected merge errors in index.html.haml and workspace.xml files
ajax reddit and some styling...
fixed conflicts
code is working, no merge errors, no routing errors
Merge pull request #25 from belindahare/master

code is working, no merge errors, no routing errors
Merge pull request #26 from lizkline91/master

ajax.. we don't have to use it if you guys don't want to.
added loop to display friends