Merge branch 'master' of https://github.com/formatjam/EpicSkillTree into front-end

Conflicts:
	public/index.html