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
added a welcome show view, added a show method to the welcome controller, changed our root route to the welcome show route
added before action to authenticate users before they see the 'logged in' view
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
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