final tweaks
Merge branch 'master' of github.com:chmbrlnd/ECEN489-Spring2014