lots o' shit
mo' shit
Merge branch 'master' of https://github.com/ericsteele/lol_champion_search

Conflicts:
	public/js/app/controllers.js
	public/partials/home.html