update
Merge branch 'master' of https://github.com/dzieyzone/lungo

Conflicts:
	assets/theme.css
	index.html