te
Merge branch 'master' of https://github.com/GroGk/Prototype

Conflicts:
	nbproject/private/private.xml
	src/prototype/StokProgram.form
	src/prototype/StokProgram.java