Old commit

Not up to date code, will be rolled back by Gaby
Merge branch 'master' of https://github.com/Sidetalker/ProgLangB

Conflicts:
	TransactionServer/.idea/workspace.xml