bjohanson/EE472-PROJECT2- — pull request #1 by bjohanson (2014-10-21 18:47:14+00:00)
Title: Update main

Merging MY changes with the master copy.