Added uploadFile(InputStream, FileType, String) and added .equals methods for CrushedFile and MediaCrushFile
Small bug fix in junit test
Merge branch 'master' of https://github.com/hypereddie10/jCrush

Conflicts:
	src/test/java/jcrush/APITest.java
Eclipse project file.