Merge branch 'master' of https://github.com/thedinj/Siegfried

Conflicts:
	Notes/Siegfried/Brainstorming.one
-a