Merge
Strange merge...

Merge branch 'master' of https://github.com/Nunkiii/node-fits

Conflicts:
	test/test.js