Merge branch 'master' of https://github.com/demibenari/kicksight

Conflicts:
	config/routes.rb