added final exam
fixed merge conflict for adding final exam
Merge branch 'master' of https://github.com/twang35/Manila