endret noe

endret noe
Merge branch 'master' of https://github.com/xlib-crew/xdev

Conflicts:
	app/views/main.html