dfgbdf
gitignore
Merge branch 'master' of https://github.com/cboisvert/whosthatgamer

Conflicts:
	.idea/workspace.xml
	protected/runtime/application.log
Api Wrapper, xbox api