b2243
Merge branch 'master' of https://github.com/pnecas/sudiyiTerminal

Conflicts:
	.gitignore
	public/style/main.css