durp

Signed-off-by: Markus Tillman <reetopps6@hotmail.com>
Merge branch 'master' of https://github.com/Malow/NDYGFX

Conflicts:
	.gitignore

Signed-off-by: Markus Tillman <reetopps6@hotmail.com>