Merge remote-tracking branch 'origin/master' into zhihao
added Sprint 3 details
Merge remote-tracking branch 'origin/master' into zhihao
added Class Diagram
Merge remote-tracking branch 'origin/master' into hamzah
user stories and usecase
Merge pull request #28 from dolob-mrmr/zhihao

Zhihao
Merge remote-tracking branch 'origin/master' into zhihao
Merge remote-tracking branch 'origin/master' into hamzah
Added generalised version of Use Case Diagram, which is in the second tab
Merge pull request #30 from dolob-mrmr/hamzah

Hamzah
Merge remote-tracking branch 'origin/master' into zhihao
updated usecase diagram 8/10/14
Merge pull request #31 from dolob-mrmr/zhihao

Zhihao
updated class diagram 8/10/14
Merge pull request #32 from dolob-mrmr/zhihao

updated class diagram 8/10/14
updated usecase diagram 8/10/14 4pm
Merge pull request #33 from dolob-mrmr/zhihao

updated usecase diagram 8/10/14 4pm
edited cameraAPI mod
Merge remote-tracking branch 'origin/master' into vincent