More work on companyList Tab of window. Still in progress
Merge branch 'master' of https://github.com/grantmcd/CS-319-Group-42

Conflicts:
	Lab2-Swing/bin/cs/iastate/edu/cs319/DataModel.class
	Lab2-Swing/bin/cs/iastate/edu/cs319/Lab2Swing$1.class
	Lab2-Swing/bin/cs/iastate/edu/cs319/Lab2Swing.class
	Lab2-Swing/companies.txt
	Lab2-Swing/src/cs/iastate/edu/cs319/Lab2Swing.java