http Server basic
Merge branch 'master' of github.com:0-0-/BankBlock

Conflicts:
	.gitignore