Added a bit of proxy
Merge branch 'Parallel' into Proxy
Proxy task is done
Small bug fix
Merge branch 'Parallel' into Proxy
Merge remote-tracking branch 'remotes/origin/JUnit' into Parallel

Conflicts:
	src/ru/fizteh/fivt/students/pershik/Storeable/StoreableTableMain.java
fixed travis error
fixed travis error
fixed travis error
Merge pull request #420 from pershik/Proxy

Першаков Николай, 394 группа, Proxy