add 3 ore
add 2 more
Merge branch 'master' of https://github.com/lizhieffe/EPI

Conflicts:
	bin/.gitignore