prepare to merge gitignore
Merge branch 'master' of github.com:slaeshjag/sporadic-projects

Conflicts:
	.gitignore
syncing