Fixed some assert statements
Merge branch 'master' of https://github.com/GuyShane/ECE-421