work on auth
Merge remote-tracking branch 'origin/master'

Conflicts:
	TwitchApp/TwitchApp.py