Merge conf
Merge branch 'master' of https://github.com/wur911/cs229-project
Final changes