Doors and Windows
Merge branch 'master' of https://github.com/zatoe/SecurityProject

Conflicts:
	bin/security/Museum.class
	src/security/Museum.java
Doors and Windows
Beta