| 
						
					 | 
					
						
						
							
						
						85da2a4def
					 | 
					
						
						
							
							Merge branch 'master' into TeamCMU
						
						
						
						
						
						
						
						adding current master changes to branch 
						
						
					 | 
					
						2017-11-18 20:42:30 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								g-spacewhale
							
						 
					 | 
					
						
						
							
						
						d9c659698b
					 | 
					
						
						
							
							Update README.md
						
						
						
						
						
						
					 | 
					
						2017-11-18 20:20:58 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								g-spacewhale
							
						 
					 | 
					
						
						
							
						
						8ddc13d65c
					 | 
					
						
						
							
							merged master
						
						
						
						
						
						
					 | 
					
						2017-11-18 10:47:48 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								g-spacewhale
							
						 
					 | 
					
						
						
							
						
						12cb2023b1
					 | 
					
						
						
							
							added swp to gitignore, removed a swp
						
						
						
						
						
						
					 | 
					
						2017-11-18 10:44:10 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								g-spacewhale
							
						 
					 | 
					
						
						
							
						
						1318b86dfb
					 | 
					
						
						
							
							removes swp files
						
						
						
						
						
						
					 | 
					
						2017-11-18 10:34:23 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								g-spacewhale
							
						 
					 | 
					
						
						
							
						
						57340e9ec3
					 | 
					
						
						
							
							Merge branch 'master' into TeamCMU
						
						
						
						
						
						
						
						merging master into branch. adding gitignore 
						
						
					 | 
					
						2017-11-18 10:30:13 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								g-spacewhale
							
						 
					 | 
					
						
						
							
						
						290046e52b
					 | 
					
						
						
							
							added .gitignore
						
						
						
						
						
						
					 | 
					
						2017-11-18 10:26:50 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								g-spacewhale
							
						 
					 | 
					
						
						
							
						
						beb1404b86
					 | 
					
						
						
							
							Merge branch 'master' into TeamCMU
						
						
						
						
						
						
					 | 
					
						2017-11-18 10:24:34 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								g-spacewhale
							
						 
					 | 
					
						
						
							
						
						638c515a03
					 | 
					
						
						
							
							removed temp and local from Readme
						
						
						
						
						
						
					 | 
					
						2017-11-18 10:14:03 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								g-spacewhale
							
						 
					 | 
					
						
						
							
						
						9bb5bf23a3
					 | 
					
						
						
							
							Merge branch 'CMUadd_partgoodU' into TeamCMU
						
						
						
						
						
						
						
						this reverts to original function as U implementation not working 
						
						
					 | 
					
						2017-11-18 10:06:51 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								g-spacewhale
							
						 
					 | 
					
						
						
							
						
						ce87ec7885
					 | 
					
						
						
							
							Merge branch 'master' into TeamCMU
						
						
						
						
						
						
					 | 
					
						2017-11-18 10:03:13 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								g-spacewhale
							
						 
					 | 
					
						
						
							
						
						46dbdd5ed5
					 | 
					
						
						
							
							changed readme
						
						
						
						
						
						
					 | 
					
						2017-11-18 10:02:21 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								g-spacewhale
							
						 
					 | 
					
						
						
							
						
						4aeb90259f
					 | 
					
						
						
							
							code not functional, added in new function reverted original function
						
						
						
						
						
						
					 | 
					
						2017-11-18 09:50:09 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								g-spacewhale
							
						 
					 | 
					
						
						
							
						
						204387c42f
					 | 
					
						
						
							
							resolved readme.m conflict to master
						
						
						
						
						
						
					 | 
					
						2017-11-18 08:36:50 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								g-spacewhale
							
						 
					 | 
					
						
						
							
						
						037d20096a
					 | 
					
						
						
							
							added codebase. changed folderstructure
						
						
						
						
						
						
					 | 
					
						2017-11-18 08:22:35 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								g-spacewhale
							
						 
					 | 
					
						
						
							
						
						95cf7cc7b3
					 | 
					
						
						
							
							edited file structure to better represent our current system. added entire code base
						
						
						
						
						
						
					 | 
					
						2017-11-18 08:16:05 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								g-spacewhale
							
						 
					 | 
					
						
						
							
						
						03f1fd78e2
					 | 
					
						
						
							
							Update README.md
						
						
						
						
						
						
					 | 
					
						2017-11-17 22:29:31 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								g-spacewhale
							
						 
					 | 
					
						
						
							
						
						623df2e3c9
					 | 
					
						
						
							
							edited readme again
						
						
						
						
						
						
					 | 
					
						2017-11-17 22:23:44 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								g-spacewhale
							
						 
					 | 
					
						
						
							
						
						874273201c
					 | 
					
						
						
							
							changed readme
						
						
						
						
						
						
					 | 
					
						2017-11-17 22:12:10 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								g-spacewhale
							
						 
					 | 
					
						
						
							
						
						b05fedb76e
					 | 
					
						
						
							
							added folder structure
						
						
						
						
						
						
					 | 
					
						2017-11-17 22:10:36 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								g-spacewhale
							
						 
					 | 
					
						
						
							
						
						d4de31d21d
					 | 
					
						
						
							
							edited readme
						
						
						
						
						
						
					 | 
					
						2017-11-17 21:40:10 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								g-spacewhale
							
						 
					 | 
					
						
						
							
						
						c876daacc7
					 | 
					
						
						
							
							added main
						
						
						
						
						
						
					 | 
					
						2017-11-17 21:38:47 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								g-spacewhale
							
						 
					 | 
					
						
						
							
						
						85a846cce4
					 | 
					
						
						
							
							edited readme
						
						
						
						
						
						
					 | 
					
						2017-11-17 21:32:21 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								g-spacewhale
							
						 
					 | 
					
						
						
							
						
						0c8ecb456a
					 | 
					
						
						
							
							edited file structure, added git instructions
						
						
						
						
						
						
					 | 
					
						2017-11-17 21:31:45 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								g-spacewhale
							
						 
					 | 
					
						
						
							
						
						a1dea01195
					 | 
					
						
						
							
							rem. legacy added commited master
						
						
						
						
						
						
						
						removed legacy file structure and added the planned structure 
						
						
					 | 
					
						2017-11-17 21:23:32 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								g-spacewhale
							
						 
					 | 
					
						
						
							
						
						5480c2e5a8
					 | 
					
						
						
							
							filestructure, parts, backlog
						
						
						
						
						
						
						
						added a filestructure as well as the basic parts. a readme and a backlog 
						
						
					 | 
					
						2017-11-17 21:09:15 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								g-spacewhale
							
						 
					 | 
					
						
						
							
						
						aa1ecd4a0b
					 | 
					
						
						
							
							Update README.md
						
						
						
						
						
						
					 | 
					
						2017-11-17 20:55:57 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								g-spacewhale
							
						 
					 | 
					
						
						
							
						
						6e0724b19a
					 | 
					
						
						
							
							Update README.md
						
						
						
						
						
						
					 | 
					
						2017-11-17 20:48:46 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								g-spacewhale
							
						 
					 | 
					
						
						
							
						
						42a1385030
					 | 
					
						
						
							
							Initial commit
						
						
						
						
						
						
					 | 
					
						2017-11-17 20:47:39 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |