index on master: 8c78636 Initial Commit
Conflict resolution, third try
Merge branch 'master' of git@github.com:bberg11/gitty.git

Conflicts:
	index.html