Bluetooth flow complete me thinks
Merge branch 'master' of github.com:DenerosArmy/Inventory

Conflicts:
	src/com/denerosarmy/inventory/Inventory.java
Merge branch 'master' of github.com:DenerosArmy/Inventory