ece411-practicum-2014/ece411-practicum-2014 — pull request #1 by nicklynchjonely (2014-10-05 22:48:57+00:00)
Title: first merge

test merge, added proposals