Added two more tests
Merge branch 'master' of https://github.com/ewilson/Project-1 into ewilson-master

Conflicts:
	test/com/mysql/jdbd/Driver/PlayerDaoTest.java
Trying to merge
Deleted random files, trying to merge
Merge https://github.com/ThomasMatlak/Project-1
Create, Select tests passing
Merge branch 'master' of https://github.com/ThomasMatlak/Project-1