diff --git a/Alamprogramm1.java b/Alamprogramm1.java
new file mode 100644
index 0000000..4d30729
--- /dev/null
+++ b/Alamprogramm1.java
@@ -0,0 +1,19 @@
+public class Alamprogramm1{
+	public static double sentimeetriteks(double tollid){
+		return tollid*2.54;
+	}
+	public static double tollideks(double sentimeetrid){
+		return sentimeetrid/2.54;
+		
+	}
+	public static double hypotenuus(double a, double b){
+		return Math.sqrt(Math.pow(a, 2)+Math.pow(b, 2));
+	}
+	public static void main(String[] args){
+		double tollidearv=3;
+		double sentimeetritearv=sentimeetriteks(tollidearv);
+		System.out.println(tollidearv+" tolli on "+sentimeetritearv+" sentimeetrit");
+		System.out.println(String.format("Sentimeetreid: %.2f", tollideks(10)));
+		System.out.println(hypotenuus(3, 4));
+	}	
+}