the flowchart photo
addphoto remove aptanan project
Update home.php
Update login.php

resolve conflicts
Update user_model.php

resolve conflict
Update routes.php

resolve conflict
Update config.php

resolve conflict
Update footer.php

resolve conflict
Update header.php

resolve conflict
clear up clutter