Phi first commit
N first commit
N second commit
Merge remote-tracking branch 'origin/P_develop_login' into develop_login

Conflicts:
	README.md
Merge branch 'N_develop_login' of https://github.com/ttphi88/Brachings into develop_login

Conflicts:
	README.md