Merge https://github.com/basti92/Tweetfacts

Conflicts:
	.idea/misc.xml
	.idea/workspace.xml