down the path of filling all gaps
merge with mel
OMG SUCH INTEROPERABILITY
merge
Merge branch 'master' of https://github.com/kevin-roark/arthur

Conflicts:
	arthur/backend/media/JavaImageMath.java