first commit
Merge branch 'master' of https://github.com/blueoxygen/cimande

Conflicts:
	.gitignore