Initial commit
bigfix made
bugfix2
fixed text.txt
all stashes re-applied and committed
amended todo list
changed the to that
added important punctuation
Merge branch 'bugfix'

Conflicts:
	bugfix.txt