no message
Merge branch 'master' of https://github.com/sirnapa/chucky
no message
Merge branch 'master' of https://github.com/sirnapa/chucky

Conflicts:
	index.html
Merge branch 'master' of https://github.com/sirnapa/chucky