s/page/text/
woops
updated .gitignore to ignore autosave files
Merge branch 'master' of github.com:nathan0/skybot
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.gitignore