[FEATURE] New comment
Some message
Merge branch 'master', remote branch 'origin/master'

Conflicts:
	bolius.dk/js/main.js