part 7
Merge branch 'master' of https://github.com/Gullanshire/SE2014_G4_Resource_Share