Committing to pull
Merge branch 'master' of https://github.com/amporto/yolo-octo-dangerzone

Conflicts:
	src/main/LoginGUI.java
Updates to Inventory Class