init.
Merge branch 'master' of github.com:ageldama/glados-wiki

Conflicts:
	.gitignore