Added first file
Added a new line to the file
One more commit.
test setup
test
more test files
Merge branch 'master' of https://github.com/nbryant/myrepo into gh-pages

Conflicts:
	comic.css
	comic.html
	file.txt