fucked everything up
Merge branch 'master' of https://github.com/Snowball239/BookStore

Conflicts:
	javaee/BookStore/BookStore-ejb/src/main/java/edu/ejb/BookEjb.java
	javaee/BookStore/BookStore-ejb/src/test/java/edu/data/BookOrderEntryTest.java
	javaee/BookStore/BookStore-ejb/src/test/java/edu/data/BookOrderTest.java
	javaee/BookStore/BookStore-ejb/src/test/java/edu/data/BookTest.java
	javaee/BookStore/BookStore-ejb/src/test/java/edu/data/IsbnTest.java
	javaee/BookStore/BookStore-ejb/src/test/java/edu/ejb/BookEjbTest.java