Technical meeting with Bryan
Merge branch 'master' of https://github.com/SugarPalaces/HRGame

Conflicts: