first commit
second commit
Merge origin/master

Conflicts:
	application/views/admin.php