Merge pull request #262 from rjynn/master

created ganttchart for proj3
Merge branch 'noMockServer'