test
'test'
tet
Merge branch 'master' of https://github.com/RyoBamboo/Drops

Conflicts:
	htdocs/assets/js/drops.js
test
Merge remote branch 'origin/master'