these files shouldn't have been added
Merge branch 'master' of github.com:elsaturnino/comp280-fa14-week4