merge
Merge branch 'master' of https://github.com/MKBid/TUBE.git

Conflicts:
	controllers/home_controller.php