Merge branch 'develop' into 'master'

.gitignore

CMPT306_Fall2017/Assets/CMPT306_Fall2017.unity

CMPT306_Fall2017/Assets/CMPT306_Fall2017.unity.meta

CMPT306_Fall2017/ProjectSettings/AudioManager.asset

CMPT306_Fall2017/ProjectSettings/ClusterInputManager.asset

CMPT306_Fall2017/ProjectSettings/DynamicsManager.asset

CMPT306_Fall2017/ProjectSettings/EditorBuildSettings.asset

CMPT306_Fall2017/ProjectSettings/EditorSettings.asset

CMPT306_Fall2017/ProjectSettings/GraphicsSettings.asset

CMPT306_Fall2017/ProjectSettings/InputManager.asset

CMPT306_Fall2017/ProjectSettings/NavMeshAreas.asset

CMPT306_Fall2017/ProjectSettings/NetworkManager.asset

CMPT306_Fall2017/ProjectSettings/Physics2DSettings.asset

CMPT306_Fall2017/ProjectSettings/ProjectSettings.asset

CMPT306_Fall2017/ProjectSettings/ProjectVersion.txt

CMPT306_Fall2017/ProjectSettings/QualitySettings.asset

CMPT306_Fall2017/ProjectSettings/TagManager.asset

CMPT306_Fall2017/ProjectSettings/TimeManager.asset

CMPT306_Fall2017/ProjectSettings/UnityConnectSettings.asset