what?
Merge branch 'master' into reverting
Revert "comments"

This reverts commit d3e0a0997db3d3649f71030b6fbde8e2ac77b9df.

Conflicts:
	js/main.js
Merge pull request #4 from campope/reverting

Reverting