Commit needed
Merge branch 'master' of https://github.com/Apostolique/TP3_Forum

Conflicts:
	TP3_Forum/Register.aspx
	TP3_Forum/Register.aspx.designer.cs
	TP3_Forum/assets/css/main.css