commit after soemone else, any problems?
Merge branch 'master' of github.com:DeathPoison/lara

Conflicts:
	application/controllers/dvs.php
	application/routes.php