clean up
Merge branch 'master' of https://github.com/Brkk/textchanger

Conflicts:
	src/main/java/com/uvic/textshare/service/rest/TextbookResource.java