er, new file
Conflict resolved?

Merge branch 'master' of https://github.com/Xrave/CS147-Final-Project
Syncing update
More merging!

Merge branch 'master' of https://github.com/Xrave/CS147-Final-Project