hoho
Merge branch 'master' of https://github.com/matst80/samak

Conflicts:
	index.js
	public/css/.sass-cache/c2fd1c7503e43ed8df647d134a04aaa55222cd47/style.scssc
	public/css/style.css
	public/css/style.scss
	public/index.htm
	public/js/base.js
	public/loggedin.htm

Signed-off-by: matst80 <mats.tornberg@gmail.com>