TF: Test Commit
Merge branch 'master' of https://github.com/Willfire19/Usephoria

Conflicts:
	public/index.html