FINAL

This should be the version I turned in. But I only copied the stuff I remembered changing, if you guys have concerns I can email you the finished version. 
On second thought, I'll just email it...