testing
Merge branch 'master' of github.com:gregmercer/gregmercer.github.io

Conflicts:
	stocks/index.html