.

README.md

 
 	Before that, needed to setup email:
 
-``` $mail = new PHPMailer(); //make instance of PHPMailer 
+```$mail = new PHPMailer(); //make instance of PHPMailer 
 	$mail->IsSMTP(); // telling the class to use SMTP
 	$mail->SMTPSecure = "tls";   // enable SMTP authentication
 
 
 For checking validation of file, needed to use (https://www.freeformatter.com/html-validator.html)
 
-<<<<<<< HEAD
 Every single page uses keywords (diligent, software, development, company, it, and specific words for that domain). It is located in meta (keywords) in the head of the document. That very important for SEO, when someone create new page on website.
-=======
-Every single page uses keywords (diligent, software, development, company, it, and specific words for that domain). It is located in meta (keywords) in the head of the document
->>>>>>> 74f7dbf469ac09b92d9e1ad2a20ef7de7fdc9c1c
 
 In order to use google captcha in html form, needed to include 	```<script src="https://www.google.com/recaptcha/api.js?onload=onloadCallback&render=explicit" ></script>``` after including **custom.js** script, after that needed to add one html element for captcha above the submit button. Define id for that element and custom attribute data-sitekey="site_key", where sitekey is google captcha key. After that at the end of custom.js file (before onloadCallback function) add new function for verification and call it in onloadCallback function

industries/financeBanking.php

 						<div class="col-md-6 col-sm-12 first-sti">
 							We are a modern software development company with experience as fuel for innovation and we are always open to talent and tech enthusiasts that can add additional value to our teams. Open positions are listed below, but if your skills are not listed, send your CV to <a class="email" href="mailto:hr@dilig.net">hr@dilig.net</a> so we can meet you and discuss how we can work together.
 		                </div>	
-<<<<<<< HEAD
 		                <div class="col-md-6 col-sm-12 wow bounceInRight second-sti"><img src="../images/financeBanking.jpg" alt=""></div>	
-=======
-		                <div class="col-md-6 col-sm-12 wow bounceInRight second-sti"><img src="images/dedicated-development-team.jpg" alt=""></div>	
->>>>>>> 74f7dbf469ac09b92d9e1ad2a20ef7de7fdc9c1c
 		            </div>		
 				</div><!-- end Services Intro -->
 				

industries/healthcare.php

 						<div class="col-md-6 col-sm-12 first-sti">
 							We are a modern software development company with experience as fuel for innovation and we are always open to talent and tech enthusiasts that can add additional value to our teams. Open positions are listed below, but if your skills are not listed, send your CV to <a class="email" href="mailto:hr@dilig.net">hr@dilig.net</a> so we can meet you and discuss how we can work together.
 		                </div>	
-<<<<<<< HEAD
 		                <div class="col-md-6 col-sm-12 wow bounceInRight second-sti"><img src="../images/healthcare.jpg" alt=""></div>	
-=======
-		                <div class="col-md-6 col-sm-12 wow bounceInRight second-sti"><img src="../images/dedicated-development-team.jpg" alt=""></div>	
->>>>>>> 74f7dbf469ac09b92d9e1ad2a20ef7de7fdc9c1c
 		            </div>		
 				</div><!-- end Services Intro -->
 				

job_apply.php

 
 $mail->Body = $msg;
 
-<<<<<<< HEAD
 $mail->AddAddress('nikola.ignjatovic@dilig.net', "HR Diligent");
-=======
-$mail->AddAddress('hr@dilig.net', "HR Diligent");
->>>>>>> 74f7dbf469ac09b92d9e1ad2a20ef7de7fdc9c1c
 $mail->IsHtml(true);
 
 $mail->send();

portfolio.php

 			</div>
 			<div class="services-wrap-cont">
 				<section  class="services partner clearfix general-section">
-<<<<<<< HEAD:portfolio.php
 			
-=======
-					<!-- <div class="section-triangle-grey"></div> -->
->>>>>>> 74f7dbf469ac09b92d9e1ad2a20ef7de7fdc9c1c:portfolio.html
 					<div class="section-title">
 						<h2>Gold Bullion International</h2>
 						<h5>New York | NY | USA | bullioninternational.com</h5>
 			</div>
 			<div class="services-wrap-cont">
 				<section  class="services partner clearfix general-section">
-<<<<<<< HEAD:portfolio.php
 				
-=======
-					<div class="section-triangle-grey"></div>
->>>>>>> 74f7dbf469ac09b92d9e1ad2a20ef7de7fdc9c1c:portfolio.html
 					<div class="section-title">
 						<h2>Profit Optics</h2>
 						<h5>Richmond | VA | USA | profitoptics.com</h5>
 			</div>
 			<div class="services-wrap-cont">
 				<section  class="services partner clearfix general-section">
-<<<<<<< HEAD:portfolio.php
 				
-=======
-					<div class="section-triangle-grey"></div>
->>>>>>> 74f7dbf469ac09b92d9e1ad2a20ef7de7fdc9c1c:portfolio.html
 					<div class="section-title">
 						<h2>Badin</h2>
 						<h5>Niš | Serbia | badinsoft.com</h5>
 			</div>
 			<div class="services-wrap-cont">
 				<section  class="services partner clearfix general-section">
-<<<<<<< HEAD:portfolio.php
 			
-=======
-					<div class="section-triangle-grey"></div>
->>>>>>> 74f7dbf469ac09b92d9e1ad2a20ef7de7fdc9c1c:portfolio.html
 					<div class="section-title">
 						<h2>Nis Ekspres</h2>
 						<h5>Niš | Serbia | nis-ekspres.rs</h5>
 			</div>
 			<div class="services-wrap-cont">
 				<section  class="services partner clearfix general-section">
-<<<<<<< HEAD:portfolio.php
 			
-=======
-					<div class="section-triangle-grey"></div>
->>>>>>> 74f7dbf469ac09b92d9e1ad2a20ef7de7fdc9c1c:portfolio.html
 					<div class="section-title">
 						<h2>SRA</h2>
 						<h5>Belgrade | Serbia | softroadapps.com</h5>
 			</div>
 			<div class="services-wrap-cont">
 				<section  class="services partner clearfix general-section">
-<<<<<<< HEAD:portfolio.php
 	
-=======
-					<div class="section-triangle-grey"></div>
->>>>>>> 74f7dbf469ac09b92d9e1ad2a20ef7de7fdc9c1c:portfolio.html
 					<div class="section-title">
 						<h2>Mould Group China</h2>
 						<h5>Guangzhou | China | mgc.tm</h5>
 		</div>
 		<div class="services-wrap-cont">
 			<section  class="services partner clearfix general-section">
-<<<<<<< HEAD:portfolio.php
 				
-=======
-				<div class="section-triangle-grey"></div>
->>>>>>> 74f7dbf469ac09b92d9e1ad2a20ef7de7fdc9c1c:portfolio.html
 				<div class="section-title">
 					<h2>AKS</h2>
 					<h5>Niš | Serbia | nebojsa.com</h5>

scripts/custom.js

 
     }
 
+    //service and industry
+    var loc = window.location;
+    if(loc.pathname.includes("services") && loc.pathname.includes("industries") )
+    {
+        console.log(loc);
+        $(".expand-menu li a[href=" + + "]").addClass("active");
+       
+    }
+        
+
    //homepage
    var previousLink;
    var indexPeviousSelectedLink = 0;
         {
             var from = fileName.lastIndexOf("\\") + 1;
             var to = fileName.length ;
-<<<<<<< HEAD
             if(to < 12)
             {
                 fileName = fileName.substring(from, to);
             {
                 fileName = fileName.substring(from, from + 12) + " ...";
             }
-=======
-            fileName = fileName.substring(from, to);
->>>>>>> 74f7dbf469ac09b92d9e1ad2a20ef7de7fdc9c1c
         }
         else{
             fileName="Choose file";
         }
         $(".resume-file-cont label").html(fileName);
 
-<<<<<<< HEAD
     });
-=======
-      });
->>>>>>> 74f7dbf469ac09b92d9e1ad2a20ef7de7fdc9c1c
     $(".btn-delete-file").click(function(e)
     {
         e.preventDefault();
     });
     var btn_apply  = $("#apply-submit");
     var apply_form = $("#apply-form");
-<<<<<<< HEAD
 
     apply_form.bind('submit',  function(ev) {
         ev.preventDefault();
 
-=======
-
-    apply_form.bind('submit',  function(ev) {
-        ev.preventDefault();
-
->>>>>>> 74f7dbf469ac09b92d9e1ad2a20ef7de7fdc9c1c
         var resume_file = document.getElementById("resume-file").files[0];
         var data = new FormData(document.getElementById("apply-form"));
         data.append("resume", "'" + resume + "'");
             error: function(error)
             {
                 console.log(console.error);
-<<<<<<< HEAD
-            }
-
-          });
-
-    });
-
-   
-
-
-
-    //apply end
-    //contact form
-
-    var contact_form = $("#contact-form");
-    var contact_button = jQuery("#contact-form #submit");
-    var status = jQuery(".log");
-
-    
-
-    contact_form.bind('submit', function(event)
-    {
-        event.preventDefault();
-        
-        var data = new FormData(document.getElementById("contact-form"));
-        
-        $.ajax({
-            url: "contact_form.php",
-            method: "POST",
-            data: data,
-            contentType: false,
-            cache: false,
-            processData:false,
-            success : function(data) {
-                               
-              window.location.replace("index.php");
-                
-            },
-            error: function(error)
-            {
-                console.log(console.error);
-            }
-
-          });
-=======
             }
 
           });
             }
 
           });
->>>>>>> 74f7dbf469ac09b92d9e1ad2a20ef7de7fdc9c1c
         
     });
  
                 var nav_link = "#navigation ."+ id +" > a";
                 var item = $(nav_link);
                 item.trigger('click');                
-<<<<<<< HEAD
                 setupUrl  =true;
-=======
-                setupUrl  =true;;
->>>>>>> 74f7dbf469ac09b92d9e1ad2a20ef7de7fdc9c1c
             }
         }
     });
             var selected  = $(this).find(".nav-active-mark");
             if(selected.length)
             {
-<<<<<<< HEAD
                 indexPeviousSelectedLink = index +1;                
-=======
-                indexPeviousSelectedLink = index +1;
-                console.log(indexPeviousSelectedLink);
->>>>>>> 74f7dbf469ac09b92d9e1ad2a20ef7de7fdc9c1c
             }
         });    
         $(this).parent().addClass('active').end().append('<span class="nav-active-mark"></span>');

services/apiDevelopmentIntegration.php

 	
 	<link rel="stylesheet" type="text/css" href=".//styles/flexslider.css" media="screen" />
 	<link id="animate_css_file" rel="stylesheet" type="text/css" href="../styles/animate.css" media="screen" />
-<<<<<<< HEAD
 	<link rel="stylesheet" type="text/css" href="../styles/prettyPhoto.css" media="screen" />
-=======
-	<link rel="stylesheet" type="text/css" href="styles/prettyPhoto.css" media="screen" />
->>>>>>> 74f7dbf469ac09b92d9e1ad2a20ef7de7fdc9c1c
 	<link href="https://fonts.googleapis.com/css?family=Open+Sans:400,600,300,700" rel="stylesheet" type="text/css">
 	
     <link href="../styles/bootstrap.min.css" rel="stylesheet" type="text/css">
 				</div>
 				<div class="service_type-intro">
 					<div class="row">
-<<<<<<< HEAD
 						<div class="col-md-6 col-sm-12 wow bounceInLeft second-sti"><img src="../images/apiDevelopmentIntegration.jpg" alt=""></div>
-=======
-						<div class="col-md-6 col-sm-12 wow bounceInRight second-sti"><img src="../images/dedicated-development-team.jpg" alt=""></div>
->>>>>>> 74f7dbf469ac09b92d9e1ad2a20ef7de7fdc9c1c
 						<div class="col-md-6 col-sm-12 first-sti">
 							We are a modern software development company with experience as fuel for innovation and we are always open to talent and tech enthusiasts that can add additional value to our teams. Open positions are listed below, but if your skills are not listed, send your CV to <a class="email" href="mailto:hr@dilig.net">hr@dilig.net</a> so we can meet you and discuss how we can work together.
 		                </div>	

services/dedicatedDevelopmentTeam.php

 				</div>
 				<div class="service_type-intro">
 					<div class="row">
-<<<<<<< HEAD
 						<div class="col-md-6 col-sm-12 wow bounceInLeft second-sti"><img src="../images/dedicated-development-team.jpg" alt=""></div>
-=======
-						<div class="col-md-6 col-sm-12 wow bounceInRight second-sti"><img src="../images/dedicated-development-team.jpg" alt=""></div>
->>>>>>> 74f7dbf469ac09b92d9e1ad2a20ef7de7fdc9c1c
 						<div class="col-md-6 col-sm-12 first-sti">
 							We are a modern software development company with experience as fuel for innovation and we are always open to talent and tech enthusiasts that can add additional value to our teams. Open positions are listed below, but if your skills are not listed, send your CV to <a class="email" href="mailto:hr@dilig.net">hr@dilig.net</a> so we can meet you and discuss how we can work together.
 		                </div>	

services/mobileApplicationDevelopment.php

 	
 	<link rel="stylesheet" type="text/css" href=".//styles/flexslider.css" media="screen" />
 	<link id="animate_css_file" rel="stylesheet" type="text/css" href="../styles/animate.css" media="screen" />
-<<<<<<< HEAD
 	<link rel="stylesheet" type="text/css" href="../styles/prettyPhoto.css" media="screen" />
-=======
-	<link rel="stylesheet" type="text/css" href="styles/prettyPhoto.css" media="screen" />
->>>>>>> 74f7dbf469ac09b92d9e1ad2a20ef7de7fdc9c1c
 	<link href="https://fonts.googleapis.com/css?family=Open+Sans:400,600,300,700" rel="stylesheet" type="text/css">
 	
     <link href="../styles/bootstrap.min.css" rel="stylesheet" type="text/css">
 				</div>
 				<div class="service_type-intro">
 					<div class="row">
-<<<<<<< HEAD
 						<div class="col-md-6 col-sm-12 wow bounceInLeft second-sti"><img src="../images/mobileApplicationDevelopment.webp" alt=""></div>
-=======
-						<div class="col-md-6 col-sm-12 wow bounceInRight second-sti"><img src="../images/dedicated-development-team.jpg" alt=""></div>
->>>>>>> 74f7dbf469ac09b92d9e1ad2a20ef7de7fdc9c1c
 						<div class="col-md-6 col-sm-12 first-sti">
 							We are a modern software development company with experience as fuel for innovation and we are always open to talent and tech enthusiasts that can add additional value to our teams. Open positions are listed below, but if your skills are not listed, send your CV to <a class="email" href="mailto:hr@dilig.net">hr@dilig.net</a> so we can meet you and discuss how we can work together.
 		                </div>	

services/softwareTesting.php

 	
 	<link rel="stylesheet" type="text/css" href=".//styles/flexslider.css" media="screen" />
 	<link id="animate_css_file" rel="stylesheet" type="text/css" href="../styles/animate.css" media="screen" />
-<<<<<<< HEAD
 	<link rel="stylesheet" type="text/css" href="../styles/prettyPhoto.css" media="screen" />
-=======
-	<link rel="stylesheet" type="text/css" href="styles/prettyPhoto.css" media="screen" />
->>>>>>> 74f7dbf469ac09b92d9e1ad2a20ef7de7fdc9c1c
 	<link href="https://fonts.googleapis.com/css?family=Open+Sans:400,600,300,700" rel="stylesheet" type="text/css">
 	
     <link href="../styles/bootstrap.min.css" rel="stylesheet" type="text/css">
 				</div>
 				<div class="service_type-intro">
 					<div class="row">
-<<<<<<< HEAD
 						<div class="col-md-6 col-sm-12 wow bounceInLeft second-sti"><img src="../images/softwareTesting.jpg" alt=""></div>
-=======
-						<div class="col-md-6 col-sm-12 wow bounceInRight second-sti"><img src="../images/dedicated-development-team.jpg" alt=""></div>
->>>>>>> 74f7dbf469ac09b92d9e1ad2a20ef7de7fdc9c1c
 						<div class="col-md-6 col-sm-12 first-sti">
 							We are a modern software development company with experience as fuel for innovation and we are always open to talent and tech enthusiasts that can add additional value to our teams. Open positions are listed below, but if your skills are not listed, send your CV to <a class="email" href="mailto:hr@dilig.net">hr@dilig.net</a> so we can meet you and discuss how we can work together.
 		                </div>	

services/sofwareProductDevelopment.php

 	
 	<link rel="stylesheet" type="text/css" href="../styles/flexslider.css" media="screen" />
 	<link id="animate_css_file" rel="stylesheet" type="text/css" href="../styles/animate.css" media="screen" />
-<<<<<<< HEAD
 	<link rel="stylesheet" type="text/css" href="../styles/prettyPhoto.css" media="screen" />
-=======
-	<link rel="stylesheet" type="text/css" href="styles/prettyPhoto.css" media="screen" />
->>>>>>> 74f7dbf469ac09b92d9e1ad2a20ef7de7fdc9c1c
 	<link href="https://fonts.googleapis.com/css?family=Open+Sans:400,600,300,700" rel="stylesheet" type="text/css">
 	
     <link href="../styles/bootstrap.min.css" rel="stylesheet" type="text/css">
 				</div>
 				<div class="service_type-intro">
 					<div class="row">
-<<<<<<< HEAD
 						<div class="col-md-6 col-sm-12 wow bounceInLeft second-sti"><img src="../images/sofwareProductDevelopment.jpg" alt=""></div>
-=======
-						<div class="col-md-6 col-sm-12 wow bounceInRight second-sti"><img src="../images/dedicated-development-team.jpg" alt=""></div>
->>>>>>> 74f7dbf469ac09b92d9e1ad2a20ef7de7fdc9c1c
 						<div class="col-md-6 col-sm-12 first-sti">
 							We are a modern software development company with experience as fuel for innovation and we are always open to talent and tech enthusiasts that can add additional value to our teams. Open positions are listed below, but if your skills are not listed, send your CV to <a class="email" href="mailto:hr@dilig.net">hr@dilig.net</a> so we can meet you and discuss how we can work together.
 		                </div>	

styles/custom.css

     width: 100%;
     padding: 10px 0px 32px 0;
 }
-<<<<<<< HEAD
 .dropdown-left img
 {
     max-height: 200px;
 }
-=======
->>>>>>> 74f7dbf469ac09b92d9e1ad2a20ef7de7fdc9c1c
 #servicesMenu ul
 {
     padding-left: 95px;
 #back-to-top span
 {
     position: relative;
-<<<<<<< HEAD
     top: 12px;
-=======
-    top: 17px;
->>>>>>> 74f7dbf469ac09b92d9e1ad2a20ef7de7fdc9c1c
     left: 29%;
     font-size: 20px;
     color: #fff;
 .careers-intro, .service_type-intro
 {
     padding-top: 30px;
-<<<<<<< HEAD
     padding-bottom: 30px;
-=======
-    
->>>>>>> 74f7dbf469ac09b92d9e1ad2a20ef7de7fdc9c1c
     display: flex;
     flex-direction: row;
 }
     height: 0;
     border-style: solid;
     border-width: 36px 63px 0px 63px;
-<<<<<<< HEAD
     border-color: #f6f6f6 transparent transparent transparent;
-=======
-    border-color: #fff transparent transparent transparent;
->>>>>>> 74f7dbf469ac09b92d9e1ad2a20ef7de7fdc9c1c
     bottom: -36px;
     left: 50%;
     transform: translateX(-50%);
     font-size: 1.3rem;
     /* right: 85px; */
     left:50px;
-<<<<<<< HEAD
     top: 0px;
-=======
-    top: 5px;
->>>>>>> 74f7dbf469ac09b92d9e1ad2a20ef7de7fdc9c1c
     cursor: pointer;
     z-index: 1;
     pointer-events: none;
 }
 
 textarea.apply-field 
-<<<<<<< HEAD
-=======
 {
     resize: none;
     padding-top: 13px;
 }
 
 
-.mobile-nav-toggle:hover{
-    color: #993c95;
-}
-#services
-{
-    padding:155 0px;
-}
-
-@media (max-width: 1024px){
-    #gallery .gallery-box
->>>>>>> 74f7dbf469ac09b92d9e1ad2a20ef7de7fdc9c1c
-{
-    resize: none;
-    padding-top: 13px;
-    height: 170px!important;
-}
-
-.apply-submit
-{
-    float:right;
-    display: block;
-    color: #fff;
-    border: none;
-    font-size: 14px;
-    font-weight: bold;
-    float: right;
-    cursor: pointer;
-    margin-top: 20px;
-    background-color: #993c95;
-    border-radius: 23px;
-    padding: 15px 25px;
-    transition:  opacity 300ms; 
-    -webkit-transition:  opacity 300ms;
-}
-<<<<<<< HEAD
-.apply-submit:hover,.contact-form input#submit:hover
-{
-    opacity: .8;
-   
-}
-.apply-submit:disabled
-{
-        background-color: #d1d1d1;
-}
-#temp-btn 
-{
-    padding:10px;
-    background-color: red;
-}
-.collapse
-{
-    transition:  display 300ms; 
-    -webkit-transition:  display 300ms; 
-}
-.resume-file
-{
-    display: block;
-
-}
-
-.delete-file
-{
-    position: relative;
-}
-.btn-delete-file
-{
-    position: relative;    
-    float: right;
-    height: 30px;
-    width: 30px;
-    cursor: pointer;   
-    z-index: 1; 
-    border: none;
-    background-color: transparent;
-}
-.btn-delete-file svg{
-    font-size: 20px;
-     
-}
-.btn-delete-file svg path
-{
-    transition:  fill 300ms;
-    -webkit-transition:  fill 300ms;
-}
-.btn-delete-file:hover svg path{
-    fill: #993c95;
-}
-.apply-submit:focus,.btn-delete-file:focus{
-    border:none;
-    outline: none;
-}
-.apply-msg-cont
-{
-    margin-top: 50px;
-    text-align: center;
-}
-.apply-msg
-{
-    visibility: hidden;
-    opacity: 0;
-    color: #28a745;
-    transition: visibility 0s linear 300ms, opacity 300ms;
-    -webkit-transition: visibility 0s linear 300ms, opacity 300ms;
-    font-size: 20px;
-}
-.apply-msg.active
-{
-    visibility: visible;
-    opacity: 1;
-  
-}
-/*apply page end*/
-.slides > * {
-    opacity :1!important;
-}
-
-
 .mobile-nav-toggle:hover{
     color: #993c95;
 }
 }
 @media (max-width: 768px)
 {
-=======
-@media (max-width: 768px){
->>>>>>> 74f7dbf469ac09b92d9e1ad2a20ef7de7fdc9c1c
     .first-sti, .second-sti
     {
         padding-bottom: 50px;
     }
 }
 
-<<<<<<< HEAD
-=======
-.diligent-purple-background
-{
-    background-color: #993c95 !important;
-}
-.diligent-purple-title
-{
-    color: #993c95 !important;
-}
-
-.padding-bottom-50
-{
-	padding-bottom:50px !important;
->>>>>>> 74f7dbf469ac09b92d9e1ad2a20ef7de7fdc9c1c