block bug fix
Merge pull request #5 from safariworld/master

merge
Merge branch 'master' of https://github.com/dimitree/cspclabWeb

Conflicts:
	templates/aboutUs.html
Merge pull request #6 from safariworld/master

merge
login page style
Merge branch 'master' of https://github.com/dimitree/cspclabWeb
signup style

login signup_success message change
Merge pull request #11 from dimitree/master

merge singup signin style