registration
Merge branch 'master' of https://github.com/ideapuff/proving

Conflicts:
	public/css/main.css
	public/sass/main.sass
	view/home.php
	view/profile.php
Merge branch 'master' of https://github.com/ideapuff/proving