commit to Bill
Merge remote-tracking branch 'origin/redux' into redux

Conflicts:
	index.html