remove response/request syntax in place of ACK/data
Merge branch 'master' of https://github.com/AndrewSelvia/Project2

merge with Justin's commit