more stuff
Merge branch 'master' of github.com:acadien/matcalc

Conflicts:
	vasp/poscarChart.py