edited
Merge branch 'master' of https://github.com/tracydou/ehwa-thesis