restarting
rebasing
updatingMerge branch 'master' of github.com:msunderlin/mike

Conflicts:
	application/config/routes.php
fixed website