Adding jar, hold on
Adding jar
Back to normal
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Hopefully ignoring workspace
Added library to project