working on make res
Merge branch 'master' of https://github.com/cst316fields/cst316fields.git