Fixed up some things
Merge remote-tracking branch 'origin/master'

Conflicts:
	finance.html
Fixed up some things