Skip to content

Commit

Permalink
Merge branch 'master' into branch-heinzhuang
Browse files Browse the repository at this point in the history
  • Loading branch information
Geinzit authored Mar 7, 2024
2 parents 0a8e23c + cc1da1f commit 2b0a8c7
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 9 deletions.
Binary file added assets/images/saber.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 5 additions & 6 deletions docs/AboutUs.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
# About us

Display | Name | Github Profile | Portfolio
--------|:-------------:|:------------------------------------:|:---------:
![](https://via.placeholder.com/100.png?text=Photo) | John Doe | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md)
![](https://via.placeholder.com/100.png?text=Photo) | Don Joe | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md)
Display | Name | Github Profile | Portfolio
--------|:-----------:|:--------------:|:---------:
![saber](../assets/images/saber.jpg) | Yuhao ZHANG | [Github](https://github.com/yzhanglp) | [Portfolio](https://yzhanglp.com)
![]() | Yao Chenguang
![](https://via.placeholder.com/100.png?text=Photo) | Yung Ka Shing | [Github](https://github.com/andy123qq4) | [Portfolio](https://google.com)
![](docs/pics/IMG_1918.PNG) | Huang Maodian | [Github](https://github.com/Geinzit) | [Portfolio](docs/team/heinzhuang.md)
![](https://via.placeholder.com/100.png?text=Photo) | John Roe | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md)
![](https://via.placeholder.com/100.png?text=Photo) | Don Roe | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md)
6 changes: 3 additions & 3 deletions docs/README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# MathGenius
<central>MathGenius is an automated arithmetic and equation problem generator that offers a high degree of customization</central>
# Duke

{Give product intro here}

Useful links:
* [User Guide](UserGuide.md)
* [Developer Guide](DeveloperGuide.md)
* [About Us](AboutUs.md)
* [Google doc](https://docs.google.com/document/d/1RgS66ig9z9QX82ZcGXtDABQ5ZZ5haTdzWKvjBMLBwXo/edit?usp=sharing)

0 comments on commit 2b0a8c7

Please sign in to comment.