test4
Merge pull request #4 from SpencerCDixon/test4

test4
Merge branch 'master' into sd-styling-1

Conflicts:
	app/views/welcome/index.html.erb