osef
Merge branch 'master' of https://github.com/IsaBartkowiak/microblog

Conflicts:
	application/Controller.php
	public/index.php
	public/login.php
good one