gitignore changed
my commit
commit for db changes
Merge remote-tracking branch 'origin/my_branch'

Conflicts:
	src/poke/client/ClientConnection.java
	src/poke/demo/Jab.java
	src/poke/resources/DocumentResource.java