Project 1 ECE422 Ualberta RC1
Merge origin/master