first commit
First Commit
First webpage commit
New file created
Update index.html
made update to webpage
Added new text to file
Merge branch 'master' of github.com:aedwards2787/Repository1

Conflicts:
	index.html
added new information to webpage
Merge branches 'web' and 'master' into web

Conflicts:
	index.html
Merge branches 'master' and 'web'
Added some new text
Update index.html
created hello world doc
Merge branch 'master' of https://github.com/aedwards2788/Repository1
Update test.html
Merge branch 'master' of https://github.com/aedwards2788/Repository-2