Merge branches 'PAN-54' and 'master' of https://github.com/atusa17/ptp into PAN-54

# Conflicts:
#	src/main/java/edu/msudenver/tsp/website/Application.java

src/main/java/edu/msudenver/tsp/website/Application.java

@@ -7,7 +7,11 @@ import org.springframework.context.annotation.ComponentScan;
 @SpringBootApplication
 @ComponentScan("edu.msudenver.tsp")
 public class Application {
+
+
     public static void main(final String[] args) {
         SpringApplication.run(Application.class, args);
     }
+
+
 }