Updated controller so now has two PIDs and might even work.
Merge remote-tracking branch 'origin/master' into datalog-improvements

Conflicts:
	rocket3.slx
Merge pull request #6 from cuspaceflight/datalog-improvements

Updated controller so now has two PIDs and might even work.