commit before checking out
Merge branch 'dev' of https://github.com/CoderK/spinbox into dev_2
for dev_2
dev
Merge branch 'dev_2' into dev

Conflicts:
	index.html
modifed after merged