friendship controller fix for add friend link
changed welcome controller
Merge pull request #34 from Mathdrquinn/master

log in now works on homepage
Merge branch 'master' of https://github.com/TIY-Q3-ROR-CHS/Team3

Conflicts:
	.idea/workspace.xml
	app/controllers/welcome_controller.rb
	app/views/layouts/application.html.haml
fixing workspace.xml again
Merge pull request #35 from belindahare/master

changes to welcome controlelr
workspace
Merge branch 'master' of github.com:TIY-Q3-ROR-CHS/Team3
fixed welcome controller merge error
corrected merge errors in the layout
Merge pull request #36 from belindahare/master

corrected merge errors in the layout
workspace
more with modals