removed 2nd old bug
Merge branch 'master' of https://github.com/PSUcapstonefall2013TeamA-PSAS/RocketTalk