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

Project status
added default, admin side and  tests to project status
fixed conflicts for project status commit
fixed conflicts
Merge pull request #62 from JoshFB/projectStatusTesting

Project status testing
Fixed bugs
Merge pull request #63 from JoshFB/statusBugs

Fixed bugs
css update
fixed