Merge branch 'master' of /Users/minhnguyen/Documents/SafetyStuffs with conflicts.
minhnguyen - pdf generation