Merge branch 'master' of /Users/minhnguyen/Documents/SafetyStuffs with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
minhnguyen - Add entity classes