final commit
Merge branch 'master' of https://github.com/wuiidl/EvS

Conflicts:
	EvS/.classpath
	EvS/bin/.gitignore
final

final
edited gitignore