firstcommit
Merge branch 'develop' of https://github.com/mzm32997/diamonddash_js into develop