Adding dist
Merge commit 'e4a30f403305c7748fa7eba38f8951a572e5525a'

Conflicts:
	dist/index.html