asdf

asdf
Merge branch 'gh-pages' of https://github.com/TearY/test into gh-pages

Conflicts:
	asdfasdfasfafs.js