Merge branch 'master' of https://github.com/PatrickDattilio/RiotApi

Conflicts:
	RiotApi.iml
	RiotApi/RiotApi-RiotApi.iml
	RiotApi/build.gradle
	build.gradle
	settings.gradle