updates
Merge branch 'master' of github.com:ValRose/ECE425W1415