Changed github address
test to see if ryan can pull
Added some added information for the user
This is the header file
Fixed merge issues
Merge branch 'master' of ece2524.ece.vt.edu:diluoffo/project
This is a test file
TEST