general formating
Merge pull request #6 from fparker9676/testing

general formating
Merge pull request #43 from fparker9676/master

formating
Merge branch 'cssifying'

Conflicts:
	app/views/layouts/application.html.erb
	app/views/welcome/_nav_selector.html.erb
fix jquery reload and fix bits and pieces