Dashing
Merge branch 'master' of https://github.com/atarng/JAMMM

Conflicts:
	JAMMM/JAMMM.suo