Deploy 7a66f52a4645bf33aab903dde0dae78d6ab20856
Merge branch 'gh-pages' of github.com:sportngin/styleguide into gh-pages

Conflicts:
	javascript.html