Locally changed 1
Merge branch 'master' of https://github.com/githubstudent/project1
Blue
Merge branch 'master' of https://github.com/githubstudent/project1

Conflicts:
	index.html
ignore jars
Fixed it