Some minor changes
Tab icons
Revert "Some minor changes"

This reverts commit c8b78dff55dad10994f61a19e893f04a5a3181d1.
Merge pull request #20 from joohnok/master

Merge pull request #5 from DITgroup2/master
Added images to tabs
Merge branch 'conclarke-master'
khg
Merge branch 'master' of https://github.com/conclarke/MainProject
Test
ku gi
Merge remote-tracking branch 'upstream/master'

Conflicts:
	bin/.gitignore
	bin/order/Account.class
	bin/order/Order.class
	src/guiTabs/MainGUI.java
	src/order/OrderDB.java
Merge pull request #24 from conclarke/master

Working?
Added profile image icon to supplier tab

Can be extended to other tabs later on, I just wanted to see how it
works
Merge pull request #25 from conclarke/master

Added profile image icon to supplier tab
Moved Peters user guide to a HTML page

Moving the user guide to a local web page like this will give far more
freedom to add navigation options between topics. This may be useful
later on, and it's easier from a user point of view
Merge pull request #26 from conclarke/master

Moved Peters user guide to a HTML page
Merge pull request #6 from DITgroup2/master

pull for John's fork