-
Notifications
You must be signed in to change notification settings - Fork 12
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #22 from ner-p/master
add new Member ~ Matthew de la Torre
- Loading branch information
Showing
2 changed files
with
22 additions
and
16 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -207,20 +207,6 @@ members: | |
- title: Email | ||
url: mailto:[email protected] | ||
icon: fa fa-envelope | ||
- name: Nick Balcomb | ||
role: MCS - Interaction and Representation in XR | ||
website: | ||
image: img/team/NickBalcomb.png | ||
social: | ||
- title: LinkedIn | ||
url: https://www.linkedin.com/in/nicholas-balcomb-0684b5134/ | ||
icon: fa fa-linkedin | ||
- title: GitHub | ||
url: https://github.com/WolfwithSword | ||
icon: fa fa-github | ||
- title: Email | ||
url: mailto:[email protected] | ||
icon: fa fa-envelope | ||
- name: Minh Nguyen | ||
role: MCS - Human Robot Interaction | ||
website: | ||
|
@@ -234,6 +220,13 @@ members: | |
icon: fa fa-github | ||
- title: Email | ||
url: mailto:[email protected] | ||
- name: Matthew de la Torre | ||
role: MCS Student - Human Computer Interaction | ||
website: | ||
image: img/team/mdlt_img.jpg | ||
social: | ||
- title: Email | ||
url: mailto:[email protected] | ||
icon: fa fa-envelope | ||
- name: Mike Flemming | ||
role: Professor, Computer Science | ||
|
@@ -263,8 +256,7 @@ members: | |
role: Associate Professor, University of Toronto | ||
website: | ||
image: img/team/Tony.png | ||
social: | ||
|
||
social: | ||
alumni: | ||
- name: Samridhi Pargal | ||
role: XR Developer - Spandrel Interactive | ||
|
@@ -384,6 +376,20 @@ members: | |
- title: LinkedIn | ||
url: https://www.linkedin.com/in/joshua-roberts-a8b295161/ | ||
icon: fa fa-linkedin | ||
- name: Nick Balcomb | ||
role: Software Developer - Mariner | ||
website: | ||
image: img/team/NickBalcomb.png | ||
social: | ||
- title: LinkedIn | ||
url: https://www.linkedin.com/in/nicholas-balcomb-0684b5134/ | ||
icon: fa fa-linkedin | ||
- title: GitHub | ||
url: https://github.com/WolfwithSword | ||
icon: fa fa-github | ||
- title: Email | ||
url: mailto:[email protected] | ||
icon: fa fa-envelop | ||
|
||
|
||
|
||
|
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.