Update
Updating Jar
Merge remote-tracking branch 'origin/master'

Conflicts:
	jar/Library.jar
Updates
Updates