Merge pull request #1 from fredgray/development

Development
Merge pull request #2 from fredgray/development

Test 3
Merge branch 'master' of https://github.com/fredgray/Repo
Merge branch 'development'
Update Untitled.html
Merge branch 'development'

Conflicts:
	Untitled.html