Merge pull request 'Add User Profile page' (#7 ) from develop into feature/profile-page

Reviewed-on: http://47.114.99.254:3000/why/se-team-project/pulls/7
Merge pull request 'Add User Login Pa' (#4 ) from feature into develop
1 changed files with 0 additions and 1 deletions
--- a/README.md
+++ b/README.md
@ -2,4 +2,3 @@
 # The SE Team Project (Modified by Dev A)
 Welcome! Please [Login Here](login.html).
Author	SHA1	Message	Date
maxiaofang	571ea0d4e2	Merge pull request 'Add User Profile page' (#7 ) from develop into feature/profile-page Reviewed-on: http://47.114.99.254:3000/why/se-team-project/pulls/7	2 weeks ago
maxiaofang	1d130ccf4c	Merge pull request 'Add User Login Pa' (#4 ) from feature into develop Reviewed-on: http://47.114.99.254:3000/why/se-team-project/pulls/4	3 weeks ago
maxiaofang	9d946a989c	Merge branch 'develop' into feature # Conflicts: # README.md	3 weeks ago
maxiaofang	cd5747bcd7	Merge branch 'develop' into feature	3 weeks ago
maxiaofang	a0fea4e241	Feat: Add link to login page in README Relates to #1	3 weeks ago
`@ -2,4 +2,3 @@`
	`# The SE Team Project (Modified by Dev A)`	`# The SE Team Project (Modified by Dev A)`
	`Welcome! Please [Login Here](login.html).`	`Welcome! Please [Login Here](login.html).`