ignore files

ignore
fix
Revert "Version 1.0"

This reverts commit 59b9ec31d617bfd0e7c873c7b031346c403ca03b.

Conflicts:
	.gitignore
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore