My modifications
Merge branch 'master' of https://github.com/ksaylor11/Pushover_Scripts

Conflicts:
	.gitignore