init state
Merge branch 'master' of github.com:deemytch/github.test

Conflicts:
	.gitignore
gitignore