structuring
Merge branch 'master' of https://github.com/EricWang94/HotFolder

Conflicts:
	src/HotFolder/HotFolder.java