Testing push again
Pushing to extension
Test
Trying extension only
Adding coals back in
Extension again
One more time
Merge commit '2e158a743c508a0f882e7741bf03bf6ec3a2d916' into develop

Conflicts:
	style.css