ignore
ignore
Merge branch 'master' of https://github.com/gkink/Exchange.git

Conflicts:
	Exchange/.classpath