diff --git a/calculator.java b/calculator.java
new file mode 100644
index 00000000..35a5e9b1
--- /dev/null
+++ b/calculator.java
@@ -0,0 +1,18 @@
+public class Calculator {
+    public int add(int a, int b) { return a + b; }
+    public int subtract(int a, int b) { return a - b; }
+    public int multiply(int a, int b) { return a * b; }
+    public int divide(int a, int b) {
+        if (b == 0) throw new IllegalArgumentException("Division by zero");
+        return a / b;
+    }
+
+    // Quick test
+    public static void main(String[] args) {
+        Calculator c = new Calculator();
+        System.out.println(c.add(2, 3));
+        System.out.println(c.subtract(5, 1));
+        System.out.println(c.multiply(4, 6));
+        System.out.println(c.divide(10, 2));
+    }
+}
diff --git a/student.java b/student.java
new file mode 100644
index 00000000..6352dff3
--- /dev/null
+++ b/student.java
@@ -0,0 +1,16 @@
+package GitHubAssignment;
+public class Student {
+    private String name;
+    private int age;
+
+    public Student(String name, int age) {
+        this.name = name;
+        this.age = age;
+    }
+
+    public String getName() { return name; }
+    public void setName(String name) { this.name = name; }
+
+    public int getAge() { return age; }
+    public void setAge(int age) { this.age = age; }
+}