first commit
Merge commit '04f10ffe182c904bb5278c6301eeabb2b8e5febf'

Conflicts:
	dist/index.html
	dist/views/main.html