Merge branch 'master' of https://bitbucket.org/JoshuaReason/irontoad

# Conflicts: # IronToad_UnityProject/Assets/_Scenes/GreyBox_Prototype.unity # IronToad_UnityProject/Library/assetDatabase3
8 years ago · 05f7b70eeb
--- a/IronToad_UnityProject/Assets/New
+++ b/IronToad_UnityProject/Assets/New
--- a/IronToad_UnityProject/Assets/_Scenes/GreyBox_Prototype.unity
+++ b/IronToad_UnityProject/Assets/_Scenes/GreyBox_Prototype.unity
--- a/IronToad_UnityProject/Library/assetDatabase3
+++ b/IronToad_UnityProject/Library/assetDatabase3