be more explicit about what the file is that we're ignoring
almost fully explicit
Merge branch 'fix-ignore-to-be-explicit'

Conflicts:
	.gitignore
slight edits for awesome
really throw things for a loop
now we have a 5th line
new new new last line
Merge branch 'new-beginnings'

Conflicts:
	overview/beginning.txt