added team2's stuff
Merge branch 'master' of https://github.com/CourseReps/ECEN489-Fall2014