Merge pull request #4 from miriammariety/master

Added main window and login frames
added additional models
• Added Contact Column in Supplier Class
• Encapsulated stuffs
completed category with accessors
Merge pull request #6 from xtianvortex/master

completed category with accessors
fixed category model
• Created Contact Class
• Added Contact Column in Supplier Class
• Encapsulated stuffs
• Added Contact Column in Supplier Class
• Encapsulated stuffs
Merge origin/master

Conflicts:
	src/models/Supplier.java
Merge pull request #7 from tontoooon/master

@Embeddable Contact added
added a Commitable class that all the database models will extend
added a Commitable class that all the database models will extend
Merge branch 'master' of github.com:LucidComplex/inventory-system
Revert "added a Commitable class that all the database models will extend"

This reverts commit 10abfc029e12642401e322560babcf3b45acdf48.
fixed previous commits, added Commitable class
Merge commit '1379'
really fixed the commits this time
updated README to include JDerby, tested Item, working insert
Merge git://github.com/miriammariety/inventory-system into test

Conflicts:
	src/tests/TestClass.java
completed user with accessors