Added VSync Setting
Merge branch 'master' of https://github.com/rangerofthewest/pangeo-code-java

Conflicts:
	.metadata/.plugins/org.eclipse.jdt.core/1604550335.index
Merge pull request #30 from rangerofthewest/master

Merge with master