strijd90/Nirfast_New — pull request #2 by strijd90 (2014-12-17 06:49:05+00:00)
Title: final changes for combination

Final files needed to combine both updated and final