updated
Merge branch 'master' of github.com:Stuy-Naught-ZiRconiuM-Cadets-of-Space/ZRAlliance2014
updated stuff, simulator won't run, will test tomorrow (i.e. later today)