Start of actual login
Merge branch 'master' of https://github.com/RubenatorX/lolTrueStory

Conflicts:
	lolTrueStory/settings.pyc