Merge branch 'pigeonflight-master'

Conflicts:
	static/index.html
Merge branch 'master' of https://github.com/RhysAllister/lessArcane
It is 12:30am and I can't really say what this commit is for. Home time!!!!