Merge branch 'master' of https://github.com/Linspire997/wtf

Conflicts:
	static/index.html