Merge branch 'master' of github.com:Giyyan/upink

Conflicts:
	notify/notify.py