merge
merge
add audio
add file
add background audio in index.html using js
set config file
Merge branch 'master' of bitbucket.org:dylandy/puchi-puchi

Conflicts:
	index.html
add index.png