Fixed up to make everything work
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/src/js/api/summonerAPI.js
Added file to do memcache work with.