ignore
Merge branch 'master' of https://github.com/jlemm45/PrintStash

Conflicts:
	.gitignore
working
Merge branch 'master' into dev_server2