Added .classpath to .gitignore
Merge branch 'master' of https://github.com/patr7/conf-reg-sys

Conflicts:
	.classpath
Merge branch 'master' of https://github.com/patr7/conf-reg-sys