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

update commits
Merge pull request #5 from ddenhart/master

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