License
Merge branch 'master' into feature/cleanup. Resolved conflicts.

Conflicts:
	asoiaf-reddit.py