Merging
Merge branch 'master' of https://github.com/aharmo3/aharmo3.github.io

Conflicts:
	ticker/ticker-v2.html