project status done
Project status and fixed tests
Fixed conflicts
Merge pull request #61 from JoshFB/projectStatus

Project status