d
need gitignore
Merge remote-tracking branch 'origin/master'

Conflicts:
	chemX/chemX/settings.pyc