changed things
Merge branch 'master' of https://github.com/jessewgray/myFirstRepo

Conflicts:
	index.html