merge belindas awesome push
Merge branch 'master' of github.com:TIY-Q3-ROR-CHS/Team3
style views and template
added image to images dir
modals
pull upstream
pulled in log-in
messed with modals
merge
Merge pull request #27 from Mathdrquinn/master

Styling, let me know if you'd like to change
Merge pull request #33 from bjlinville1/master

Created a view so you can build a "logged out" view
log in now works on homepage
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