merge github and local

11 files changed, 17 insertions, 11 deletions

diff --git a/franken.m b/franken.m
index b771d71..caf85a5 100755
--- a/franken.m
+++ b/franken.m
@@ -1,7 +1,7 @@
 % EK301, Section A1, Group 7, 4/09/12
 % Michael Abed, ID U55178419
 % Joseph Stone, ID U44434740
-% Ben Havey, ID 
+% Ben Havey, ID U46525972
 
 % franken truss
 
diff --git a/franken.out b/franken.out
index e7dacd9..4bd9d56 100755
--- a/franken.out
+++ b/franken.out
@@ -1,7 +1,7 @@
 % EK301, Section A1, Group 7, Team GNU, 4/09/12
 % Michael Abed, ID U55178419
 % Joseph Stone, ID U44434740
-% Ben Havey, ID 
+% Ben Havey, ID U46525972
 Load: 3.920 N
 Member forces in Newtons:
 m1: 2.884 (C)
diff --git a/pratt.m b/pratt.m
index 3ec6de7..9113356 100644
--- a/pratt.m
+++ b/pratt.m
@@ -1,7 +1,7 @@
 % EK301, Section A1, Group 7, 4/09/12

 % Michael Abed, ID U55178419

 % Joseph Stone, ID U44434740

-% Ben Havey, ID 

+% Ben Havey, ID U46525972

 

 % pratt truss

 

diff --git a/pratt.out b/pratt.out
index e44a542..98aaecf 100755
--- a/pratt.out
+++ b/pratt.out
@@ -1,7 +1,7 @@
 % EK301, Section A1, Group 7, Team GNU, 4/09/12
 % Michael Abed, ID U55178419
 % Joseph Stone, ID U44434740
-% Ben Havey, ID 
+% Ben Havey, ID U46525972
 Load: 3.920 N
 Member forces in Newtons:
 m1: 2.772 (C)
diff --git a/pratt2.m b/pratt2.m
index e94b91d..4b42172 100755
--- a/pratt2.m
+++ b/pratt2.m
@@ -1,7 +1,7 @@
 % EK301, Section A1, Group 7, 4/09/12

 % Michael Abed, ID U55178419

 % Joseph Stone, ID U44434740

-% Ben Havey, ID 

+% Ben Havey, ID U46525972

 

 % modified pratt truss

 

diff --git a/pratt2.out b/pratt2.out
index 4f53d91..e5b4fc0 100755
--- a/pratt2.out
+++ b/pratt2.out
@@ -1,7 +1,7 @@
 % EK301, Section A1, Group 7, Team GNU, 4/09/12
 % Michael Abed, ID U55178419
 % Joseph Stone, ID U44434740
-% Ben Havey, ID 
+% Ben Havey, ID U46525972
 Load: 3.920 N
 Member forces in Newtons:
 m1: 2.828 (C)
diff --git a/printHeader.m b/printHeader.m
index 8b5291b..4fa3cc9 100755
--- a/printHeader.m
+++ b/printHeader.m
@@ -2,6 +2,6 @@ function [] = printHeader()
     fprintf('%% EK301, Section A1, Group 7, Team GNU, 4/09/12\n');
     fprintf('%% Michael Abed, ID U55178419\n');
     fprintf('%% Joseph Stone, ID U44434740\n');
-    fprintf('%% Ben Havey, ID U46525972\n');
+    fprintf('%% Ben Havey, ID U46525972 \n');
     
-end
\ No newline at end of file
+end
diff --git a/truss_data_1.m b/truss_data_1.m
index b192b3e..98cbfe0 100755
--- a/truss_data_1.m
+++ b/truss_data_1.m
@@ -1,7 +1,7 @@
 % EK301, Section A1, Group 7, 4/09/12
 % Michael Abed, ID U55178419
 % Joseph Stone, ID U44434740
-% Ben Havey, ID 
+% Ben Havey, ID U46525972
 
 % sample problem truss
 
diff --git a/truss_solver.m b/truss_solver.m
index 81e3cc8..8250627 100755
--- a/truss_solver.m
+++ b/truss_solver.m
@@ -1,3 +1,9 @@
+% EK301, Section A1, Group 7, The GNUs
+% Michael Abed ID U55178419 
+% Joseph Stone ID U44434740
+% Ben Havey ID U46525972
+
+% main truss solver program
 
 filename = input('Input truss data-file name: ', 's');
 
diff --git a/warren.m b/warren.m
index 9f61689..43119fd 100755
--- a/warren.m
+++ b/warren.m
@@ -1,7 +1,7 @@
 % EK301, Section A1, Group 7, 4/09/12
 % Michael Abed, ID U55178419
 % Joseph Stone, ID U44434740
-% Ben Havey, ID 
+% Ben Havey, ID U46525972
 
 % warren truss
 
diff --git a/warren.out b/warren.out
index efa0be4..4c3d63c 100755
--- a/warren.out
+++ b/warren.out
@@ -1,7 +1,7 @@
 % EK301, Section A1, Group 7, Team GNU, 4/09/12
 % Michael Abed, ID U55178419
 % Joseph Stone, ID U44434740
-% Ben Havey, ID 
+% Ben Havey, ID U46525972
 Load: 3.920 N
 Member forces in Newtons:
 m1: 2.263 (C)