commit before merge
Merge branch 'master' of github.com:rhwang201/294-1-hw2
Fixing concat