closed #27
Jesamine closed #27

Merge branch 'develop'

* develop:
  closed #27

Conflicts:
	js/script.dist.js.map