Merge pull request #1 from ece411-practicum-2014/master

update commits