Merge branch 'master' of https://github.com/AlexHayton/UnityTestProject2 into Rami
Merge branch 'master' of https://github.com/AlexHayton/UnityTestProject2 into Rami
Merge branch 'alex' of https://github.com/AlexHayton/UnityTestProject2 into Rami
-added placeholder icons for weapons
Merge branch 'refs/heads/Rami' into alex
Tweaks