AAAAAAAAAAAHHHHHHHHHHHHHHHHHHHHHHasdasdas
Merge branch 'master' of http://www.github.com/corperk/jnontetravex

Conflicts:
	src/jnontextravex/JNonTetravex.java
sdasdasdasdasdasd