Merge branch 'master' of https://github.com/RichmondDay/www.mini.ca
Merge branch 'master' of https://github.com/tonyrd/www.mini.ca