new branch for testing
updated application
more application info
adoption-request vm fleshed out
merge
resolved AdoptionController merge
Added Entities.java
Updated tests
Merge branch 'nthomas' of https://github.com/SystemsInMotion/Guardian-Angel-Animal-Rescue.git into nthomas
Changed how pet is added to the application
controller test mocks
commit to fix sync issues
Merge branch 'nthomas' of https://github.com/SystemsInMotion/Guardian-Angel-Animal-Rescue into nthomas

Conflicts:
	src/main/java/org/gaar/web/controller/mvc/AdoptionController.java

	modified:   src/main/java/org/gaar/web/controller/mvc/AdoptionController.java
	new file:   src/main/resources/velocity/adoption-request.vm
	new file:   src/test/java/org/gaar/Entities.java
	new file:   src/test/java/org/gaar/web/controller/mvc/AdoptionControllerTest.java
Refactored Entities
Reinserted Count Variables to Entities, was previously just using size
of list.
merged
Merge branch 'nthomas' of https://github.com/SystemsInMotion/Guardian-Angel-Animal-Rescue.git into nthomas
freaky wimpi is freaking me out
fixed broken merge
Breakpoint breaking