Merge branch 'development' of https://github.com/fredgray/Repo into development

Conflicts:
	Untitled.html
Updated
Resolve Conflict