upload
Merge https://github.com/SiebelsTim/Redditviewer

Conflicts:
	.gitignore