Fixed par
Merge branch 'master' of https://github.com/jimjh/315-project