updated version, fixing method to parse args, fixing conversion writing \r and \n, other fixes
Adding some stuff to RESTful endpoints
commiting changed stuff at master, it's all rolled back, no worries
Merge branch 'master' of https://github.com/tjones788/BTL-REST

Conflicts:
	BTL-REST/src/java/edu/usd/btl/REST/CategoriesResource.java
	BTL-REST/src/java/edu/usd/btl/data/TestServlet.java
Fixing some stuff