Merge pull request #1 from nicklynchjonely/master

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

Merge pull request #1 from nicklynchjonely/master