first commit
2014c2g12
add c2g12 triangle
Merge branch 'master' of https://github.com/coursemdetw/2014c2
add c2g12 w13 Japan
add c2g12 w13 Japan