Blue feature
Merge branch 'master' into feature1

Conflicts:
	index.html
Merge pull request #1 from githubstudent/feature1

Blue feature