first commit
Merge branch 'master' of https://github.com/pirufio/leagueofchampions

Conflicts:
	.gitignore