ignore some unnecessary files
Merge remote-tracking branch 'upstream/master'
adapt code to new version
adapt code to new version
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
Merge pull request #9 from nmduc/master

Adapt code