env example
merging
merging
Merge commit '95184529b6d22a33e1cf3afe0bfa092cc4391770'

Conflicts:
	WinRun4J/src/common/Runtime.cpp
Merge branch 'master' of git@github.com:poidasmith/winrun4j.git