update
style update
Merge branch 'master' of https://github.com/rinkevics/visand

Conflicts:
	css/main.css
style
style
pogas
markup