3rd Change
Merge branch 'BlakeWeb' of github.com:acronos7021/Stare into BlakeWeb

Conflicts:
	StareProject/HTML/test.txt