ppf
Merge branch 'master' of https://github.com/dreademarco/Spectrometer

Conflicts:
	prototypes/ppf/main.cpp
Merge branch 'master' of https://github.com/dreademarco/Spectrometer
Merge branch 'master' of https://github.com/dreademarco/Spectrometer
PPF
PPF Pipeline
PPF Pipeline