Merge branch 'master' of https://github.com/cwade179/decompile.git

Conflicts:
	src/main/java/com/wade/decompile/ClassFileData.java
	src/main/java/com/wade/decompile/ConstantPool.java
	src/main/java/com/wade/decompile/Decompiler.java
	src/main/java/com/wade/decompile/pool/ClassTagInfo.java
	src/main/java/com/wade/decompile/pool/DoubleTagInfo.java
	src/main/java/com/wade/decompile/pool/FieldRefTagInfo.java
	src/main/java/com/wade/decompile/pool/FloatTagInfo.java
	src/main/java/com/wade/decompile/pool/IntegerTagInfo.java
	src/main/java/com/wade/decompile/pool/InterfaceMethodRefTagInfo.java
	src/main/java/com/wade/decompile/pool/LongTagInfo.java
	src/main/java/com/wade/decompile/pool/MethodRefTagInfo.java
	src/main/java/com/wade/decompile/pool/NameAndTypeTagInfo.java
	src/main/java/com/wade/decompile/pool/StringTagInfo.java
	src/main/java/com/wade/decompile/pool/TagInfo.java
	src/main/java/com/wade/decompile/pool/UTF8TagInfo.java