initial version
added class to execute
switched packaging to jar
removed some tabs, updated web.xml, modified pom to produce both war and jar, cleaned up poms
cleaned up pom, organized code, updated pom to allow for jar and war
active heroku profile when running on heroku
active heroku profile when running on heroku
enabled logback logging via slf4j and removed old spring config files
works but not well
works but not well
not working
working now
working with manual injection
working with manual injection
added back jersey spring
Added back spring
added app context
Merge branch 'withspring'

Conflicts:
	pom.xml
	src/main/java/org/jham/encrypt/EncryptionHelper.java
	src/main/java/org/jham/heroku/JHamHeroku.java
	src/main/java/org/jham/service/EncryptionService.java
	src/main/resources/applicationContext.xml
	src/main/webapp/WEB-INF/web.xml
	src/test/java/XorTest.java
major refactoring
added name and description