I don't know
Merge branch 'master' of https://github.com/blakeypark/Eclipse

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.jdt.core/1237770135.index
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/version.ini
added non resizable