Added an extension
Forgot to add the 3rd hole
Finished the new idea
Commit the file
Added the assembly
Added 2 parts to the assembly
First commit for testing out a rebase
Added a hole to the cube
Added another assembly
Added part
Added another part
Did a manual merge
Merge branch 'Test'

I think I am starting to get the hang of this

Conflicts:
	FirstAssembly.iam
Added a text file
First
Changed text
Fixed the merge confilct