main controller update
Merge branch 'master' of https://github.com/nhu313/red_cross