ok# Please enter the commit message for your changes. Lines starting# with '#' will be ignored, and an empty message aborts the commit.# On branch master# Changes to be committed:#	modified:   bin/DatabaseHandlerRunnable.class#	modified:   bin/DatabaseTuple.class#	modified:   bin/FetchRunnable.class#	modified:   bin/MainDef.class#	deleted:    bin/UrlGetXml.class#	modified:   src/DatabaseHandlerRunnable.java#	modified:   src/DatabaseTuple.java#	modified:   src/FetchRunnable.java#	modified:   src/MainDef.java#	deleted:    src/UrlGetXml.java## Untracked files:#	lib/javabase64-1.2.jar.zip#	lib/js.jar#	lib/proxy-vole_20131209.jar#
Merge branch 'master' of https://github.com/lds56/SRTP
year

Conflicts:
	bin/DatabaseHandlerRunnable.class
	bin/FetchRunnable.class
	src/DatabaseHandlerRunnable.java
	src/FetchRunnable.java
add twitter module