edit snip
Merge remote-tracking branch 'origin/master'

Conflicts:
	snippets/html/bootstrap.snip
	snippets/html/phaser.snip