1:30
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/views/header2.php