Avi version
Merge branch 'master' of https://github.com/cmaa14/thesis