Merge branch 'master' of github.com:h4w5/tineetees
Merge branch 'master' of github.com:h4w5/tineetees
created the welcome page
splash page almost finished; need to see what variables used for sessions
Merge branch 'master' of github.com:h4w5/tineetees into customer_front_end

Conflicts:
	app/controllers/welcome_controller.rb
	app/views/welcome/index.html.erb
	config/routes.rb
added session controller helper methods logged_in?
merged seeds and application.css