From 2
gitignore from 2
Merge branch 'master' of
https://github.com/MikeandCyril/FrontendPart.git

Conflicts:
	FrontEnd/WebContent/login.html