Version 1.0.4
Merge branch 'gh-pages' of github.com:soapower/soapower into gh-pages

Conflicts:
	index.html