de
Merge branch 'master' of https://github.com/monocromatica/forex

Conflicts:
	demo.html