Changes made on remote
Merge branch 'master' of https://github.com/sharktamer/gtsnotifier_flask

Conflicts:
	gtsnotifier.py
	templates/about.html
	templates/add_form.html
	templates/contact.html
	templates/help.html
	templates/remove_form.html
Fixed git buggery