blalblagasd
Merge branch 'master' of https://github.com/scbasma/Metonix1.0

Conflicts:
	src/storage/Storage.java