chien
Merge branch 'master' of https://github.com/mrstocks/secret-ninja
arg
Merge branch 'master' of https://github.com/mrstocks/secret-ninja

Conflicts:
	public/css/personal.css
	views/bienvenu/index.php
	views/news/view.php
	views/shared/footer.php