yfgtyfugkf
Merge branch 'master' of https://github.com/maxuna/GerdasSyhorna

Conflicts:
	GerdasSyhornaData.mdf
	GerdasSyhornaLog.ldf